\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{calcifer} \pdfinfo{ /Title (git-cs.pdf) /Creator (Cheatography) /Author (calcifer) /Subject (git\_cs 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}{026E51} \definecolor{LightBackground}{HTML}{F7FAF9} \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\_cs Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{calcifer} via \textcolor{DarkBackground}{\uline{cheatography.com/74756/cs/18751/}}} \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}calcifer \\ \uline{cheatography.com/calcifer} \\ \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 8th February, 2019.\\ 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}{Branching, Merging, and Fetching}} \tn % Row 0 \SetRowColor{LightBackground} git branch {[}-v{]} {[}(-{}-merged | -{}-no-merged){]} & Lists all the alive branches \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git branch \textless{}branch\textgreater{} \textless{}remote\textgreater{} & Creates a new branch \tn % Row Count 5 (+ 2) % Row 2 \SetRowColor{LightBackground} git branch -d \textless{}branch\textgreater{} & Deletes a branch \tn % Row Count 7 (+ 2) % Row 3 \SetRowColor{white} git checkout \textless{}branch\textgreater{} & Switches to a branch \tn % Row Count 9 (+ 2) % Row 4 \SetRowColor{LightBackground} git checkout -b \textless{}branch\textgreater{} & Creates and switches to a new branch \tn % Row Count 11 (+ 2) % Row 5 \SetRowColor{white} git merge \textless{}branch\textgreater{} & Merges the checked-out branch with the \textless{}branch\textgreater{} one \tn % Row Count 14 (+ 3) % Row 6 \SetRowColor{LightBackground} git fetch {[}\textless{}remote\textgreater{}|-{}-all{]} & Updates the local info about the remote branch data \tn % Row Count 17 (+ 3) % Row 7 \SetRowColor{white} git push {[}-u{]} \textless{}remote\textgreater{} \textless{}branch\textgreater{}{[}:\textless{}remote\_branch\textgreater{}{]} & Pushed the branch to the remote server \tn % Row Count 20 (+ 3) % Row 8 \SetRowColor{LightBackground} git pull \textless{}remote\textgreater{} & Fetches and pulls a remote branch \tn % Row Count 22 (+ 2) % Row 9 \SetRowColor{white} git rebase \textless{}remote\textgreater{} & From last common ancestor, applies remote, then local changes \tn % Row Count 26 (+ 4) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{2.73735 cm} x{2.23965 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Git Status Checks}} \tn % Row 0 \SetRowColor{LightBackground} git status {[}-s{]} & Checks the status of local repo \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git check -{}-diff & Checks for trailing whitespaces \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git diff {[}-{}-cached{]} & Shows staged and unstaged changes \tn % Row Count 6 (+ 2) % Row 3 \SetRowColor{white} git log {[}-p{]} {[}-n{]} {[}-{}-grep {[}-{}-pretty{]} {[}-Sfoo{]} & Shows the repo history \tn % Row Count 8 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{1.74195 cm} x{3.23505 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Undoing Things}} \tn % Row 0 \SetRowColor{LightBackground} git commit -{}-amend & Undoes the last commit \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git reset HEAD \textless{}file\textgreater{} & Unstages the changes to a file or directory \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git checkout -{}- \textless{}file\textgreater{} & Undoes the changes to a file or directory \tn % Row Count 6 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{3.18528 cm} x{1.79172 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Tagging}} \tn % Row 0 \SetRowColor{LightBackground} git tag {[}-l{]} & Lists all tags \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} git tag -a \textless{}tag\textgreater{} {[}-m \textless{}msg\textgreater{}{]} & Creates a \textless{}tag\textgreater{} tag \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} git push \textless{}origin\textgreater{} {[}\textless{}tag\textgreater{} | -{}-tags{]} & Shares the tag \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} git checkout -b \textless{}branch\textgreater{} \textless{}tag\textgreater{} & Tag checkout \tn % Row Count 7 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Terms and Common Workflows}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{} \tn % Row Count 0 (+ 0) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{1.34379 cm} x{3.63321 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Terms}} \tn % Row 0 \SetRowColor{LightBackground} Tracking branch & Local branch that has a direct relationship to a remote branch \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} \mymulticolumn{2}{x{5.377cm}}{Refspec} \tn % Row Count 4 (+ 1) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{2}{x{5.377cm}}{Patch} \tn % Row Count 5 (+ 1) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Get latest from Git branch}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{git fetch origin/\textless{}branch\textgreater{} \newline git rebase origin/\textless{}branch\textgreater{} \newline git merge origin/\textless{}branch\textgreater{}} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Add file to .gitignore}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{git rm -{}-cached \textless{}file\textgreater{} \newline echo '\textless{}file\textgreater{}' .gitignore \newline git commit -m "Added \textless{}file\textgreater{} to .gitignore"} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Removes file from git, keeping them in the hard drive} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Tagging Later}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{git log -{}-pretty=online \newline git tag -a \textless{}tag\textgreater{} \textless{}tag\textgreater{} \textless{}commit\_hash\textgreater{}} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Common aliases}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{git config -{}-global alias.co checkout \newline git config -{}-global alias.br branch \newline git config -{}-global alias.ci commit \newline git config -{}-global alias.st status \newline git config -{}-global alias.unstage 'reset HEAD -{}-' \newline git config -{}-global alias.last 'log -1 HEAD'} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}