\documentclass[10pt,a4paper]{article} % Packages \usepackage{fancyhdr} % For header and footer \usepackage{multicol} % Allows multicols in tables \usepackage{tabularx} % Intelligent column widths \usepackage{tabulary} % Used in header and footer \usepackage{hhline} % Border under tables \usepackage{graphicx} % For images \usepackage{xcolor} % For hex colours %\usepackage[utf8x]{inputenc} % For unicode character support \usepackage[T1]{fontenc} % Without this we get weird character replacements \usepackage{colortbl} % For coloured tables \usepackage{setspace} % For line height \usepackage{lastpage} % Needed for total page number \usepackage{seqsplit} % Splits long words. %\usepackage{opensans} % Can't make this work so far. Shame. Would be lovely. \usepackage[normalem]{ulem} % For underlining links % Most of the following are not required for the majority % of cheat sheets but are needed for some symbol support. \usepackage{amsmath} % Symbols \usepackage{MnSymbol} % Symbols \usepackage{wasysym} % Symbols %\usepackage[english,german,french,spanish,italian]{babel} % Languages % Document Info \author{sevargasca} \pdfinfo{ /Title (git-and-github.pdf) /Creator (Cheatography) /Author (sevargasca) /Subject (Git \& Github Cheat Sheet) } % Lengths and widths \addtolength{\textwidth}{6cm} \addtolength{\textheight}{-1cm} \addtolength{\hoffset}{-3cm} \addtolength{\voffset}{-2cm} \setlength{\tabcolsep}{0.2cm} % Space between columns \setlength{\headsep}{-12pt} % Reduce space between header and content \setlength{\headheight}{85pt} % If less, LaTeX automatically increases it \renewcommand{\footrulewidth}{0pt} % Remove footer line \renewcommand{\headrulewidth}{0pt} % Remove header line \renewcommand{\seqinsert}{\ifmmode\allowbreak\else\-\fi} % Hyphens in seqsplit % This two commands together give roughly % the right line height in the tables \renewcommand{\arraystretch}{1.3} \onehalfspacing % Commands \newcommand{\SetRowColor}[1]{\noalign{\gdef\RowColorName{#1}}\rowcolor{\RowColorName}} % Shortcut for row colour \newcommand{\mymulticolumn}[3]{\multicolumn{#1}{>{\columncolor{\RowColorName}}#2}{#3}} % For coloured multi-cols \newcolumntype{x}[1]{>{\raggedright}p{#1}} % New column types for ragged-right paragraph columns \newcommand{\tn}{\tabularnewline} % Required as custom column type in use % Font and Colours \definecolor{HeadBackground}{HTML}{333333} \definecolor{FootBackground}{HTML}{666666} \definecolor{TextColor}{HTML}{333333} \definecolor{DarkBackground}{HTML}{141414} \definecolor{LightBackground}{HTML}{F7F7F7} \renewcommand{\familydefault}{\sfdefault} \color{TextColor} % Header and Footer \pagestyle{fancy} \fancyhead{} % Set header to blank \fancyfoot{} % Set footer to blank \fancyhead[L]{ \noindent \begin{multicols}{3} \begin{tabulary}{5.8cm}{C} \SetRowColor{DarkBackground} \vspace{-7pt} {\parbox{\dimexpr\textwidth-2\fboxsep\relax}{\noindent \hspace*{-6pt}\includegraphics[width=5.8cm]{/web/www.cheatography.com/public/images/cheatography_logo.pdf}} } \end{tabulary} \columnbreak \begin{tabulary}{11cm}{L} \vspace{-2pt}\large{\bf{\textcolor{DarkBackground}{\textrm{Git \& Github Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{sevargasca} via \textcolor{DarkBackground}{\uline{cheatography.com/168476/cs/35225/}}} \end{tabulary} \end{multicols}} \fancyfoot[L]{ \footnotesize \noindent \begin{multicols}{3} \begin{tabulary}{5.8cm}{LL} \SetRowColor{FootBackground} \mymulticolumn{2}{p{5.377cm}}{\bf\textcolor{white}{Cheatographer}} \\ \vspace{-2pt}sevargasca \\ \uline{cheatography.com/sevargasca} \\ \end{tabulary} \vfill \columnbreak \begin{tabulary}{5.8cm}{L} \SetRowColor{FootBackground} \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}} \\ \vspace{-2pt}Not Yet Published.\\ Updated 12th November, 2022.\\ Page {\thepage} of \pageref{LastPage}. \end{tabulary} \vfill \columnbreak \begin{tabulary}{5.8cm}{L} \SetRowColor{FootBackground} \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Sponsor}} \\ \SetRowColor{white} \vspace{-5pt} %\includegraphics[width=48px,height=48px]{dave.jpeg} Measure your website readability!\\ www.readability-score.com \end{tabulary} \end{multicols}} \begin{document} \raggedright \raggedcolumns % Set font size to small. Switch to any value % from this page to resize cheat sheet text: % www.emerson.emory.edu/services/latex/latex_169.html \footnotesize % Small font. \begin{multicols*}{3} \begin{tabularx}{5.377cm}{x{2.4885 cm} x{2.4885 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{General}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{Start git config firstime username}} & git config —global user.name "name" \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} {\bf{Start git config firstime email}} & git config —global user.email "email" \tn % Row Count 6 (+ 3) % Row 2 \SetRowColor{LightBackground} {\bf{Open a list of help commands}} & Git -{}-help \tn % Row Count 8 (+ 2) % Row 3 \SetRowColor{white} {\bf{Web documentation on the console}} & Git help commit \tn % Row Count 10 (+ 2) % Row 4 \SetRowColor{LightBackground} {\bf{To add a new folder}} & Cd (paste folder address) \tn % Row Count 12 (+ 2) % Row 5 \SetRowColor{white} {\bf{To see the user email and the branch}} & Git config —global e \tn % Row Count 14 (+ 2) % Row 6 \SetRowColor{LightBackground} **To reboot when you are on the global e & :ql \tn % Row Count 16 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{2.83689 cm} x{2.14011 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Repository commands}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{To create the repository on the folder}} & Git INIT \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} Show files that are on the stage & Git Status \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} To put folder on stage & Git add y git add . \tn % Row Count 6 (+ 2) % Row 3 \SetRowColor{white} To take it out form the stage & Git reset (folder) \tn % Row Count 8 (+ 2) % Row 4 \SetRowColor{LightBackground} To create a log on repository & Git commit -m "first commit" \tn % Row Count 10 (+ 2) % Row 5 \SetRowColor{white} Show commit history & Git log (or git lg with alias) \tn % Row Count 12 (+ 2) % Row 6 \SetRowColor{LightBackground} Get back to last commit & Git checkout-{}- . \tn % Row Count 14 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{2.4885 cm} x{2.4885 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Branches}} \tn % Row 0 \SetRowColor{LightBackground} Cambiar el nombre de la rama & git branch -m master main \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} Iniciar un proyecto con la rama default de main en vez de master & git config —global init.defaultBranch \textless{}rama\textgreater{} \tn % Row Count 6 (+ 4) % Row 2 \SetRowColor{LightBackground} Crear una nueva rama & Git branch "nombre" \tn % Row Count 8 (+ 2) % Row 3 \SetRowColor{white} Cambiar entre ramas & git checkout nombre \tn % Row Count 9 (+ 1) % Row 4 \SetRowColor{LightBackground} Unir dos ramas & git merge nombre \tn % Row Count 10 (+ 1) % Row 5 \SetRowColor{white} Borrar la rama que ya no se necesita & git branch -d nombre \tn % Row Count 12 (+ 2) % Row 6 \SetRowColor{LightBackground} Confirmar cambios que no han sido unificados & git branch -d nombre -f \tn % Row Count 15 (+ 3) % Row 7 \SetRowColor{white} Crear una nueva rama y pasar automaticamente a ella & git checkout -b nombre \tn % Row Count 18 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{2.4885 cm} x{2.4885 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{All about commits}} \tn % Row 0 \SetRowColor{LightBackground} Para realizar el proceso de agregar un cambio y el commit de forma automática & git commit -am "nombre del cambio" \tn % Row Count 4 (+ 4) % Row 1 \SetRowColor{white} en carpetas & git add carpeta/*.js —\textgreater{} \tn % Row Count 6 (+ 2) % Row 2 \SetRowColor{LightBackground} fuera de carpetas & git add ./*.html —\textgreater{} f \tn % Row Count 8 (+ 2) % Row 3 \SetRowColor{white} Cuando tienes muchos subdirectorios, de esa manera toma todas las carpetas que hayan dentro de css \#\#\# Para la creación de carpetas que empiezan vacías .gitcommit & git add css/ \tn % Row Count 17 (+ 9) % Row 4 \SetRowColor{LightBackground} Para la creación de carpetas que empiezan vacías .gitcommit & git add carpeta/.gitkeep \tn % Row Count 21 (+ 4) % Row 5 \SetRowColor{white} Alias for log = git lg & git config -{}-global alias.lg "log -{}-graph -{}-abbrev-commit -{}-decorate -{}-format=format:'\%C(bold blue)\%h\%C(reset) - \%C(bold \seqsplit{green)(\%ar)\%C(reset)} \seqsplit{\%C(white)\%s\%C(reset)} \%C(dim white)- \seqsplit{\%an\%C(reset)\%C(bold} \seqsplit{yellow)\%d\%C(reset)'} -{}-all" \tn % Row Count 33 (+ 12) \end{tabularx} \par\addvspace{1.3em} \vfill \columnbreak \begin{tabularx}{5.377cm}{x{2.4885 cm} x{2.4885 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{All about commits (cont)}} \tn % Row 6 \SetRowColor{LightBackground} Modificando un commit que ya existe & git commit -{}-amend -m "edited name" \tn % Row Count 2 (+ 2) % Row 7 \SetRowColor{white} Apuntar a un commit especifico & HEAD\textasciicircum{} y número \tn % Row Count 4 (+ 2) % Row 8 \SetRowColor{LightBackground} Editar nombre de un commit especifico & git commit reset —soft (id del commit) \tn % Row Count 6 (+ 2) % Row 9 \SetRowColor{white} ir a un commit en el tiempo para empezar desde ahi & git reset -{}-soft {\emph{id}} \tn % Row Count 9 (+ 3) % Row 10 \SetRowColor{LightBackground} Viajar a un repositorio eliminado & git commit reset —hard (id del commit eliminado) \tn % Row Count 12 (+ 3) % Row 11 \SetRowColor{white} Cambiar el nombre de un archivo o renombrarlo & git mv "nombre del archivo" "nuevo nombre del archivo" \tn % Row Count 16 (+ 4) % Row 12 \SetRowColor{LightBackground} Eliminar un archivo desde el GIT (lo mantiene en el stage, por lo que se puede recuperar con git reset hard) & git rm "nombre del archivo" \tn % Row Count 22 (+ 6) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{2.33919 cm} x{2.63781 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{GitHub}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{Add tags}} & git tag {\emph{name}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} {\bf{check tags}} & git tag \tn % Row Count 2 (+ 1) % Row 2 \SetRowColor{LightBackground} {\bf{Pull remote changes}} & git pull \tn % Row Count 4 (+ 2) % Row 3 \SetRowColor{white} {\bf{Push local changes}} & git push \tn % Row Count 6 (+ 2) % Row 4 \SetRowColor{LightBackground} {\bf{Set global config for rebase}} & git config -{}-global pull.rebase true \tn % Row Count 8 (+ 2) % Row 5 \SetRowColor{white} {\bf{see conflict changes}} & git stash \tn % Row Count 10 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}