\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{MKoe}
\pdfinfo{
  /Title (git-basics.pdf)
  /Creator (Cheatography)
  /Author (MKoe)
  /Subject (Git Basics 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}{82AB82}
\definecolor{LightBackground}{HTML}{F7F9F7}
\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 Basics Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{MKoe} via \textcolor{DarkBackground}{\uline{cheatography.com/174546/cs/36666/}}}
\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}MKoe \\
  \uline{cheatography.com/mkoe} \\
  \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 24th January, 2023.\\
   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}{Getting a Git Repository - p. 26}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{{\bf{Initializing Repository in Existing Directory}}} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
Go to directory & \$ cd \seqsplit{C:/Users/user/my\_project} \tn 
% Row Count 3 (+ 2)
% Row 2
\SetRowColor{LightBackground}
Initialize .git \{\{nl\}\}subdirectory & \$ git init \tn 
% Row Count 5 (+ 2)
% Row 3
\SetRowColor{white}
\{\{rowspan=2\}\}Begin file tracking & \$ git add *.c \tn 
% Row Count 7 (+ 2)
% Row 4
\SetRowColor{LightBackground}
 & \$ git add LICENSE \tn 
% Row Count 8 (+ 1)
% Row 5
\SetRowColor{white}
Initial Commit & \$ git commit -m \textless{}message\textgreater{} \tn 
% Row Count 10 (+ 2)
% Row 6
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{{\bf{Cloning Existing Repository}}} \tn 
% Row Count 11 (+ 1)
% Row 7
\SetRowColor{white}
Clone directory & \$ git clone \textless{}url\textgreater{} \textless{}directory name\textgreater{} \tn 
% Row Count 13 (+ 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}{Tracking File Status - p. 28}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{{\bf{Tracked files}}} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
\mymulticolumn{2}{x{5.377cm}}{Files that were in last snapshot + any newly staged files} \tn 
% Row Count 3 (+ 2)
% Row 2
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{can be unmodified, modified, or staged} \tn 
% Row Count 4 (+ 1)
% Row 3
\SetRowColor{white}
\mymulticolumn{2}{x{5.377cm}}{{\bf{Untracked Files}}} \tn 
% Row Count 5 (+ 1)
% Row 4
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{any files in working directory that were not in your last snapshot and are not in your staging area.} \tn 
% Row Count 7 (+ 2)
% Row 5
\SetRowColor{white}
\mymulticolumn{2}{x{5.377cm}}{won't be included in your commit snapshots until explicitly told} \tn 
% Row Count 9 (+ 2)
% Row 6
\SetRowColor{LightBackground}
{\bf{\$ git status}} & check status \tn 
% Row Count 10 (+ 1)
% Row 7
\SetRowColor{white}
{\bf{\$ git add \textless{}file/directory name\textgreater{}}} & track new file, stage file \tn 
% Row Count 12 (+ 2)
% Row 8
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{If you modify a file after you run git add, you have to run git add again to stage the latest version of the file} \tn 
% Row Count 15 (+ 3)
% Row 9
\SetRowColor{white}
{\bf{\$ git status -s}} & check status (short) \tn 
% Row Count 17 (+ 2)
% Row 10
\SetRowColor{LightBackground}
\{\{ar\}\}?? & new untracked files \tn 
% Row Count 19 (+ 2)
% Row 11
\SetRowColor{white}
\{\{ar\}\}A & newly staged files \tn 
% Row Count 21 (+ 2)
% Row 12
\SetRowColor{LightBackground}
\{\{ar\}\}M & modified files \tn 
% Row Count 22 (+ 1)
% Row 13
\SetRowColor{white}
\mymulticolumn{2}{x{5.377cm}}{lefthand column indicates status of staging area and the right-hand column indicates status of working tree} \tn 
% Row Count 25 (+ 3)
% Row 14
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{{\bf{Ignoring Files}}} \tn 
% Row Count 26 (+ 1)
% Row 15
\SetRowColor{white}
\mymulticolumn{2}{x{5.377cm}}{repository might have a single .gitignore file in its root directory, which applies to the entire repository} \tn 
% Row Count 29 (+ 3)
% Row 16
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{additional .gitignore files in subdirectories possible} \tn 
% Row Count 31 (+ 2)
\end{tabularx}
\par\addvspace{1.3em}

\vfill
\columnbreak
\begin{tabularx}{5.377cm}{x{2.83689 cm} x{2.14011 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Tracking File Status - p. 28 (cont)}}  \tn
% Row 17
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{specifies which files are ignored by version control} \tn 
% Row Count 2 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{2.04057 cm} x{2.93643 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{View and Commit Changes - p. 33}}  \tn
% Row 0
\SetRowColor{LightBackground}
{\bf{git diff}} & view unstaged changes \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
{\bf{git diff -{}-staged}} & compare staged changes to last commit \tn 
% Row Count 3 (+ 2)
% Row 2
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{If all changes are staged, git diff will give no output.} \tn 
% Row Count 5 (+ 2)
% Row 3
\SetRowColor{white}
{\bf{git difftool}} & view changes in graphical difftool \tn 
% Row Count 7 (+ 2)
% Row 4
\SetRowColor{LightBackground}
{\bf{git commit}} & commit changes, launches editor for commit message \tn 
% Row Count 10 (+ 3)
% Row 5
\SetRowColor{white}
{\bf{git commit -m}} & add message in command line \tn 
% Row Count 12 (+ 2)
% Row 6
\SetRowColor{LightBackground}
{\bf{git commit -a}} & commit all changed files, skip staging \tn 
% Row Count 14 (+ 2)
% Row 7
\SetRowColor{white}
{\bf{git rm}} & remove file from tracked files \tn 
% Row Count 16 (+ 2)
% Row 8
\SetRowColor{LightBackground}
{\bf{git rm -f}} & force removal of already staged file \tn 
% Row Count 18 (+ 2)
% Row 9
\SetRowColor{white}
{\bf{git rm -{}-cached}} & remove file from Git track, keep it on hard drive \tn 
% Row Count 21 (+ 3)
% Row 10
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{If you simply remove the file from working directory, it shows up under the "Changes not staged for commit"} \tn 
% Row Count 24 (+ 3)
% Row 11
\SetRowColor{white}
{\bf{git mv file\_from file\_to}} & Move/Rename File \tn 
% Row Count 26 (+ 2)
% Row 12
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{Git doesn't explicitly track file movement} \tn 
% Row Count 27 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{2.43873 cm} x{2.53827 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Viewing the Commit History - p. 40}}  \tn
% Row 0
\SetRowColor{LightBackground}
{\bf{git log}} & list commits made in chronological order \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
{\bf{git log -p}} & show difference introduced in each commit \tn 
% Row Count 5 (+ 3)
% Row 2
\SetRowColor{LightBackground}
{\bf{git log -2}} & show last two log entries \tn 
% Row Count 7 (+ 2)
% Row 3
\SetRowColor{white}
{\bf{git log -{}-stat}} & show abbreviated stats for each commit \tn 
% Row Count 9 (+ 2)
% Row 4
\SetRowColor{LightBackground}
{\bf{git log -{}-pretty}} & change log output format \tn 
% Row Count 11 (+ 2)
% Row 5
\SetRowColor{white}
{\bf{pretty=format: "\%h - \%an, \%ar : \%s"}} & format specifier for log output \tn 
% Row Count 14 (+ 3)
% Row 6
\SetRowColor{LightBackground}
\{\{ar\}\}\%h & abbreviated commit hash \tn 
% Row Count 16 (+ 2)
% Row 7
\SetRowColor{white}
\{\{ar\}\}\%an & author name \tn 
% Row Count 17 (+ 1)
% Row 8
\SetRowColor{LightBackground}
\{\{ar\}\}\%ar & author date, relative \tn 
% Row Count 19 (+ 2)
% Row 9
\SetRowColor{white}
\{\{ar\}\}\%s & Subject \tn 
% Row Count 20 (+ 1)
% Row 10
\SetRowColor{LightBackground}
{\bf{git log -{}-graph}} & display ASCII graph for merging history \tn 
% Row Count 22 (+ 2)
% Row 11
\SetRowColor{white}
{\bf{git log -{}-since=x}} & limit log output to time x \tn 
% Row Count 24 (+ 2)
% Row 12
\SetRowColor{LightBackground}
{\bf{git log -{}-author=x}} & limit log output to author x \tn 
% Row Count 26 (+ 2)
% Row 13
\SetRowColor{white}
{\bf{git log -{}-all-match}} & limit output to those that match all limiting patterns \tn 
% Row Count 29 (+ 3)
% Row 14
\SetRowColor{LightBackground}
{\bf{git log -S}} & Only show commits adding or removing code matching string \tn 
% Row Count 32 (+ 3)
\end{tabularx}
\par\addvspace{1.3em}

\vfill
\columnbreak
\begin{tabularx}{5.377cm}{x{2.43873 cm} x{2.53827 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Viewing the Commit History - p. 40 (cont)}}  \tn
% Row 15
\SetRowColor{LightBackground}
{\bf{-{}- path/file}} & limit log output to changes introduced in specified files \tn 
% Row Count 3 (+ 3)
% Row 16
\SetRowColor{white}
\mymulticolumn{2}{x{5.377cm}}{Is always the last option and is generally preceded by double dashes (-{}-) to separate paths from the options} \tn 
% Row Count 6 (+ 3)
% Row 17
\SetRowColor{LightBackground}
{\bf{-{}-no-merges}} & prevent display of merge commits \tn 
% Row Count 8 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}


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

\end{document}