\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{gsalem}
\pdfinfo{
  /Title (git.pdf)
  /Creator (Cheatography)
  /Author (gsalem)
  /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}{526D8A}
\definecolor{LightBackground}{HTML}{F4F5F7}
\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}{gsalem} via \textcolor{DarkBackground}{\uline{cheatography.com/52847/cs/14308/}}}
\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}gsalem \\
  \uline{cheatography.com/gsalem} \\
  \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 15th January, 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{tabularx}{17.67cm}{x{8.635 cm} x{8.635 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{CONFIGURE TOOLING}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git config -{}-global user.name "{[}name{]}"` & Set the name you want attached to your commit transactions \tn 
% Row Count 3 (+ 3)
% Row 1
\SetRowColor{white}
`git config -{}-global user.email "{[}email address{]}"` & Set the email you want attached to your commit transactions \tn 
% Row Count 6 (+ 3)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{6.0445 cm} x{11.2255 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{CREATE REPOSITORIES}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git init` & Creates a new local repository with the specified name \tn 
% Row Count 3 (+ 3)
% Row 1
\SetRowColor{white}
`git clone {[}repo url{]}` & Downloads a project and its entire version history \tn 
% Row Count 5 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{7.5988 cm} x{9.6712 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{MAKE CHANGES}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git status` & List changed files in your working directory \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
`git diff` & List changes to tracked files \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
`git diff -{}-staged` & List file differences between staging and the last file version \tn 
% Row Count 7 (+ 3)
% Row 3
\SetRowColor{white}
`git add .` & Add {\emph{all}} current changes to the next commit \tn 
% Row Count 9 (+ 2)
% Row 4
\SetRowColor{LightBackground}
`git add -p {[}file-name{]}` & Add {\emph{some}} changes in {[}file-name{]} to the next commit \tn 
% Row Count 12 (+ 3)
% Row 5
\SetRowColor{white}
`git commit -m " {[}commit msg{]} "` & Commit local changes and add msg \tn 
% Row Count 14 (+ 2)
% Row 6
\SetRowColor{LightBackground}
`git commit -a` & Commit all local changes in tracked files \tn 
% Row Count 16 (+ 2)
% Row 7
\SetRowColor{white}
`git commit -{}-amend` & Change the last commit* \tn 
% Row Count 18 (+ 2)
% Row 8
\SetRowColor{LightBackground}
`git reset \textless{}file\textgreater{}` & Unstage the file, but preserve its contents \tn 
% Row Count 20 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{17.67cm}}{*  {\bf{Don't amend published commits!}}}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{7.2534 cm} x{10.0166 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{GROUP CHANGES}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git branch` & List all local branches in the current repository \tn 
% Row Count 3 (+ 3)
% Row 1
\SetRowColor{white}
`git branch {[}branch-name{]}` & Create new {[}branch{]} based on your current HEAD \tn 
% Row Count 5 (+ 2)
% Row 2
\SetRowColor{LightBackground}
`git branch -d {[}branch-name{]}` & Delete specified branch \tn 
% Row Count 7 (+ 2)
% Row 3
\SetRowColor{white}
`git checkout {[}branch-name{]}` & Switch HEAD branch \tn 
% Row Count 9 (+ 2)
% Row 4
\SetRowColor{LightBackground}
`git merge {[}branch-name{]}` & Merge {[}branch-name{]} into your current HEAD \tn 
% Row Count 11 (+ 2)
% Row 5
\SetRowColor{white}
`git tag {[}tag-name{]}` & Mark the current commit with a tag \tn 
% Row Count 13 (+ 2)
% Row 6
\SetRowColor{LightBackground}
`cat .git/HEAD` & See what HEAD points too \tn 
% Row Count 15 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{17.67cm}}{You can think of the HEAD as the "current branch". When you switch branches with `git checkout`, the HEAD revision changes to point to the tip of the new branch.}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{7.9442 cm} x{9.3258 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{SYNCHRONIZE}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git remote show {[}remote-name{]}` & Show information about a remote \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
`git remote -v` & List all currently configured remotes \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
`git branch -dr {[}remote{]}/{[}branch{]}` & Delete a branch on the remote \tn 
% Row Count 6 (+ 2)
% Row 3
\SetRowColor{white}
`git fetch {[}remote{]}` & Download all changes from {[}remote{]} but do'nt integrate into HEAD \tn 
% Row Count 10 (+ 4)
% Row 4
\SetRowColor{LightBackground}
`git pull {[}remote{]} {[}branch{]}` & Download changes and directly merge/integrates into HEAD \tn 
% Row Count 13 (+ 3)
% Row 5
\SetRowColor{white}
`git push {[}remote{]} {[}branch{]}` & Publish local changes on a remote \tn 
% Row Count 15 (+ 2)
% Row 6
\SetRowColor{LightBackground}
`git push -{}-tags` & Publish your tags \tn 
% Row Count 16 (+ 1)
% Row 7
\SetRowColor{white}
`git merge {[}remote{]}/{[}branch{]}` & Combine the remote {[}branch{]} into your current HEAD \tn 
% Row Count 19 (+ 3)
% Row 8
\SetRowColor{LightBackground}
`git pull` & Download bookmark history and incorporates changes \tn 
% Row Count 22 (+ 3)
% Row 9
\SetRowColor{white}
`git add \textless{}resolved-file\textgreater{}` & Use your editor to manually solve conflicts and (after resolving) mark file as resolved \tn 
% Row Count 27 (+ 5)
% Row 10
\SetRowColor{LightBackground}
`git rm \textless{}resolved-file\textgreater{}` & Use your editor to manually solve conflicts and (after resolving) mark file as resolved \tn 
% Row Count 32 (+ 5)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{6.5626 cm} x{10.7074 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{COMMIT HISTORY}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git log` & Show all commits, starting with newest \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
`git log -p {[}file-name{]}` & Show changes over time for a specific file \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
`git blame {[}file-name{]}` & Who changed what and when in {[}file-name{]} \tn 
% Row Count 6 (+ 2)
% Row 3
\SetRowColor{white}
`git show {[}commit-ID{]}` & Output metadata and content changes a specific commit \tn 
% Row Count 9 (+ 3)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{6.908 cm} x{10.362 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{UNDO}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git reset -{}-hard HEAD` & Discard all local changes in your working directory \tn 
% Row Count 3 (+ 3)
% Row 1
\SetRowColor{white}
`git checkout HEAD {[}file{]}` & Discard local changes in a specific file \tn 
% Row Count 5 (+ 2)
% Row 2
\SetRowColor{LightBackground}
`git revert {[}commit{]}` & Revert a commit (by producing a new commit with contrary changes) \tn 
% Row Count 8 (+ 3)
% Row 3
\SetRowColor{white}
`git reset -{}-hard {[}commit{]}` & Discard all history and changes back to the specified commit \tn 
% Row Count 11 (+ 3)
% Row 4
\SetRowColor{LightBackground}
`git reset {[}commit{]}` & Revert a commit (by producing a new commit with contrary changes) {\emph{and preserve all changes as unstaged changes}} \tn 
% Row Count 16 (+ 5)
% Row 5
\SetRowColor{white}
`git reset -{}-keep {[}commit{]}` & Revert a commit (by producing a new commit with contrary changes) {\emph{and preserve uncommitted local changes}} \tn 
% Row Count 21 (+ 5)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{17.67cm}}{\bf\textcolor{white}{WORKFLOW}}  \tn
\SetRowColor{LightBackground}
\mymulticolumn{1}{p{17.67cm}}{\vspace{1px}\centerline{\includegraphics[width=5.1cm]{/web/www.cheatography.com/public/uploads/gsalem_1515997352_main-qimg-0eecee8a7ee46aae0443e8e071582f00.png}}} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{17.67cm}}{workspace \{\{fa-arrows-h\}\} working directory \newline index \{\{fa-arrows-h\}\} staging area \newline local repository \{\{fa-arrows-h\}\} HEAD}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{17.67cm}}{\bf\textcolor{white}{SOURCES}}  \tn
\SetRowColor{white}
\mymulticolumn{1}{x{17.67cm}}{\{\{link="https://services.github.com/on-demand/downloads/github-git-cheat-sheet/"\}\}GitHub Git Cheat Sheet\{\{/link\}\} \newline % Row Count 3 (+ 3)
\{\{link="www.git-tower.com"\}\}Git Tower\{\{/link\}\} \newline % Row Count 4 (+ 1)
\{\{link="https://appendto.com/2015/06/making-sense-of-git-a-visual-perspective/"\}\}Making Sense of Git – A Visual Perspective\{\{/link\}\}% Row Count 7 (+ 3)
} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}



\end{document}