\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{DmanDman} \pdfinfo{ /Title (git.pdf) /Creator (Cheatography) /Author (DmanDman) /Subject (git 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}{A3A3A3} \definecolor{LightBackground}{HTML}{F3F3F3} \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 Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{DmanDman} via \textcolor{DarkBackground}{\uline{cheatography.com/31811/cs/15684/}}} \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}DmanDman \\ \uline{cheatography.com/dmandman} \\ \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 May, 2018.\\ 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.18988 cm} x{2.78712 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Branch List}} \tn % Row 0 \SetRowColor{LightBackground} List branch tree view & `git log -{}-graph` \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} Ex: & `git log -{}-graph -{}-pret\{\{noshy\}\}ty=medium -{}-abbrev-commit` \tn % Row Count 5 (+ 3) % Row 2 \SetRowColor{LightBackground} List changed files & `git ls-tree -{}-name-only {[}branch-name{]}` \tn % Row Count 7 (+ 2) % Row 3 \SetRowColor{white} List all branches & `git branch` \tn % Row Count 8 (+ 1) % Row 4 \SetRowColor{LightBackground} Show branches and their commits & `git show-branch` \{\{nl\}\} \{\{popup="http://bit.ly/2HPsVBw"\}\}show-branch options\{\{/popup\}\} \tn % Row Count 12 (+ 4) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{1.89126 cm} x{3.08574 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Merge}} \tn % Row 0 \SetRowColor{LightBackground} Mergetool help & `git mergetool -{}-tool-help` \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} Tell git to use opendiff & `git mergetool -t opendiff` \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} Merge changes & `git merge {[}merge from branch{]}` \{\{nl\}\} (must be on merge into branch) \tn % Row Count 7 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{2.18988 cm} x{2.78712 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Commands}} \tn % Row 0 \SetRowColor{LightBackground} Show differences & `git diff -{}-name-only {[}branch1{]} {[}branch2{]}` \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} Staus of changes & `git status` \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} Add change/file to be committed & `git add .` \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} & `git add {[}file\_name{]}` \tn % Row Count 6 (+ 1) % Row 4 \SetRowColor{LightBackground} Commit changes & `git commit -m "Your message here"` \tn % Row Count 8 (+ 2) % Row 5 \SetRowColor{white} Commit changes - Vim editor save & esc - :w ( save ) - :q ( quit ) \tn % Row Count 10 (+ 2) % Row 6 \SetRowColor{LightBackground} Create new branch & `git checkout -b {[}New Branch Name{]}` \tn % Row Count 12 (+ 2) % Row 7 \SetRowColor{white} Remove file from commit - Step 1 & `git rm my-bad-fi\{\{noshy\}\}le.txt` \tn % Row Count 14 (+ 2) % Row 8 \SetRowColor{LightBackground} Remove file from commit - Step 2 & `git commit -{}-amend` \{\{nl\}\} if a commit was performed \tn % Row Count 17 (+ 3) % Row 9 \SetRowColor{white} Ignore files & create {\bf{.gitignore}} file - add file names to ignore \tn % Row Count 20 (+ 3) % Row 10 \SetRowColor{LightBackground} Remove from add & `git reset {[}filename.txt{]}` \tn % Row Count 22 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{0.84609 cm} x{4.13091 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Links}} \tn % Row 0 \SetRowColor{LightBackground} -{}-pretty & \{\{popup="http://bit.ly/2HJZzsw"\}\}pretty formats\{\{/popup\}\} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} reset & \{\{popup="http://bit.ly/2IlG6h5"\}\}reset detail\{\{/popup\}\} \tn % Row Count 4 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}