\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{{[}deleted{]}}
\pdfinfo{
  /Title (git-one-branch-one-author.pdf)
  /Creator (Cheatography)
  /Author ({[}deleted{]})
  /Subject (Git - one branch, one author 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 - one branch, one author Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{{[}deleted{]}} via \textcolor{DarkBackground}{\uline{cheatography.com/30394/cs/9049/}}}
\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}{[}deleted{]} \\
  \uline{cheatography.com/deleted-30394} \\
  \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 2nd December, 2016.\\
   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*}{2}

\begin{tabularx}{8.4cm}{x{4 cm} x{4 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Basic Setup}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{configure settings}}} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
git config -{}-global user.name "{\emph{My Name}}" & set user name \tn 
% Row Count 4 (+ 3)
% Row 2
\SetRowColor{LightBackground}
git config -{}-global user.email "{\emph{myname@school.edu}}" & set user email \tn 
% Row Count 7 (+ 3)
% Row 3
\SetRowColor{white}
git config -{}-global color.ui "auto" & make it colorful \tn 
% Row Count 9 (+ 2)
% Row 4
\SetRowColor{LightBackground}
git config -{}-list & see all settings \tn 
% Row Count 10 (+ 1)
% Row 5
\SetRowColor{white}
\mymulticolumn{2}{x{8.4cm}}{{\bf{initialize}}} \tn 
% Row Count 11 (+ 1)
% Row 6
\SetRowColor{LightBackground}
git init & initialize repository in current directory \tn 
% Row Count 14 (+ 3)
% Row 7
\SetRowColor{white}
\mymulticolumn{2}{x{8.4cm}}{{\bf{ignore}}} \tn 
% Row Count 15 (+ 1)
% Row 8
\SetRowColor{LightBackground}
touch .gitignore & setup txt file with list of files and directories to ignore (one per line) \tn 
% Row Count 19 (+ 4)
% Row 9
\SetRowColor{white}
*.pdf & ignore pdf files everywhere \tn 
% Row Count 21 (+ 2)
% Row 10
\SetRowColor{LightBackground}
model/* & ignore everything in models directory \tn 
% Row Count 23 (+ 2)
% Row 11
\SetRowColor{white}
!models/scripts & don't ignore the scripts directory underneath models \tn 
% Row Count 26 (+ 3)
% Row 12
\SetRowColor{LightBackground}
git -rm -{}-cached {\emph{file1}} & file1 was tracked at one point and keeps showing up in git status - this removes it from tracking (as long as file1 is also in .gitignore) \tn 
% Row Count 33 (+ 7)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{3.92 cm} x{4.08 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{History}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{log}}} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
git log & show all commits \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
q & escape long readout and return to command line \tn 
% Row Count 5 (+ 3)
% Row 3
\SetRowColor{white}
git log -oneline & returns just one line per commit (commit hash + message) \tn 
% Row Count 8 (+ 3)
% Row 4
\SetRowColor{LightBackground}
git log -{\emph{n}} & view {\emph{n}} most recent commits \tn 
% Row Count 10 (+ 2)
% Row 5
\SetRowColor{white}
git log {\emph{file}} & show file commits \tn 
% Row Count 11 (+ 1)
% Row 6
\SetRowColor{LightBackground}
git log -{}-before {\emph{date}} & date specified as yyy-mm-dd or 2.days.ago \tn 
% Row Count 14 (+ 3)
% Row 7
\SetRowColor{white}
git log -{}-after {\emph{date}} -{}-before {\emph{date}} & specify date range \tn 
% Row Count 16 (+ 2)
% Row 8
\SetRowColor{LightBackground}
git log -p & view entire diff of changes for each commit found \tn 
% Row Count 19 (+ 3)
% Row 9
\SetRowColor{white}
git log -{}-stat & summary of changes in each commit (\# lines added, removed, etc.) \tn 
% Row Count 23 (+ 4)
% Row 10
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{checkout}}} \tn 
% Row Count 24 (+ 1)
% Row 11
\SetRowColor{white}
git checkout {\emph{abcde}} {\emph{file}} & checkout specific version of file \tn 
% Row Count 26 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{3.92 cm} x{4.08 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Local changes}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{special bash}}} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
git mv {\emph{oldfile}} {\emph{newfile}} & preserves git history when renaming. git also figures it out if `git add {\emph{newfile}}` and `git rm {\emph{oldfile}}`, but that takes longer. \tn 
% Row Count 8 (+ 7)
% Row 2
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{status}}} \tn 
% Row Count 9 (+ 1)
% Row 3
\SetRowColor{white}
git status & shows all files that have been changed since last commit \tn 
% Row Count 12 (+ 3)
% Row 4
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{compare}}} \tn 
% Row Count 13 (+ 1)
% Row 5
\SetRowColor{white}
git diff {\emph{file1}} & compare local file1 to last commit of file1 \tn 
% Row Count 16 (+ 3)
% Row 6
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{{\emph{whoops - undo!}}}}} \tn 
% Row Count 17 (+ 1)
% Row 7
\SetRowColor{white}
git checkout -{}- {\emph{file1}} & go back to previous committed version, toss all changes out the window \tn 
% Row Count 21 (+ 4)
% Row 8
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{add}}} \tn 
% Row Count 22 (+ 1)
% Row 9
\SetRowColor{white}
git add {\emph{file1}} {\emph{file2}} {\emph{file3}} & stage files for commit \tn 
% Row Count 24 (+ 2)
% Row 10
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{{\emph{whoops - undo!}}}}} \tn 
% Row Count 25 (+ 1)
% Row 11
\SetRowColor{white}
git rm -{}-cached {\emph{file1}} & unstage file1 \tn 
% Row Count 27 (+ 2)
% Row 12
\SetRowColor{LightBackground}
git rm -r -{}-cached . & unstage all files recursively \tn 
% Row Count 29 (+ 2)
% Row 13
\SetRowColor{white}
\mymulticolumn{2}{x{8.4cm}}{{\bf{commit}}} \tn 
% Row Count 30 (+ 1)
\end{tabularx}
\par\addvspace{1.3em}

\vfill
\columnbreak
\begin{tabularx}{8.4cm}{x{3.92 cm} x{4.08 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Local changes (cont)}}  \tn
% Row 14
\SetRowColor{LightBackground}
git commit -m "My message" & commit staged files with a message \tn 
% Row Count 2 (+ 2)
% Row 15
\SetRowColor{white}
git commit -a -m "My message" & stages all modified or removed files first (combines add and commit) \tn 
% Row Count 6 (+ 4)
% Row 16
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\bf{{\emph{whoops - undo!}}}}} \tn 
% Row Count 7 (+ 1)
% Row 17
\SetRowColor{white}
git commit -{}-amend & edit the last message (if file has changed, changes will also be added to last commit) \tn 
% Row Count 12 (+ 5)
% Row 18
\SetRowColor{LightBackground}
git commit -{}-amend -m "Better message" & ditto \tn 
% Row Count 14 (+ 2)
% Row 19
\SetRowColor{white}
git reset HEAD\textasciitilde{}1 & undo entire commit, changes are still there but are now unstaged \tn 
% Row Count 18 (+ 4)
% Row 20
\SetRowColor{LightBackground}
git reset -{}-hard HEAD\textasciitilde{}1 & undo entire commit, revert to previous version (changes all gone) \tn 
% Row Count 22 (+ 4)
% Row 21
\SetRowColor{white}
git reset -{}-hard {\emph{abcde}} & return to specified version \tn 
% Row Count 24 (+ 2)
% Row 22
\SetRowColor{LightBackground}
git revert HEAD\textasciitilde{}2 & go back to earlier version by making new commit (rather than undoing commits) \tn 
% Row Count 28 (+ 4)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{`git rm` totally deletes the file (+ git tracking). To only remove file from git tracking, `git rm -{}-cached`}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{2 cm} x{6 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Forks and Branches}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{{\emph{Fork}}} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
{\emph{fork}} button & On the repository you want to contribute to \tn 
% Row Count 3 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}


% That's all folks
\end{multicols*}

\end{document}