\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{Loreno10}
\pdfinfo{
  /Title (git.pdf)
  /Creator (Cheatography)
  /Author (Loreno10)
  /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}{D90303}
\definecolor{LightBackground}{HTML}{FCEFEF}
\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}{Loreno10} via \textcolor{DarkBackground}{\uline{cheatography.com/124704/cs/23866/}}}
\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}Loreno10 \\
  \uline{cheatography.com/loreno10} \\
  \end{tabulary}
\vfill
\columnbreak
\begin{tabulary}{5.8cm}{L}
  \SetRowColor{FootBackground}
  \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}}  \\
   \vspace{-2pt}Published 7th December, 2020.\\
   Updated 20th December, 2020.\\
   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}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{States}}  \tn
\SetRowColor{LightBackground}
\mymulticolumn{1}{p{8.4cm}}{\vspace{1px}\centerline{\includegraphics[width=5.1cm]{/web/www.cheatography.com/public/uploads/loreno10_1596014855_Annotation 2020-07-29 112719.png}}} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{3.76 cm} x{4.24 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Diff}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git diff` & WORKSPACE vs STAGED \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
`git diff -{}-staged` (or `-{}-cached`) & STAGED vs COMMITED \tn 
% Row Count 3 (+ 2)
% Row 2
\SetRowColor{LightBackground}
`git diff HEAD` & WORKSPACE + STAGED vs COMMITED \tn 
% Row Count 5 (+ 2)
% Row 3
\SetRowColor{white}
`git diff \textless{}SHA-1\textgreater{}` & WORKSPACE vs any commit (more general case of the above) \tn 
% Row Count 8 (+ 3)
% Row 4
\SetRowColor{LightBackground}
`git diff master...topic` & Changes introduced if topic gets merged into master \tn 
% Row Count 11 (+ 3)
% Row 5
\SetRowColor{white}
`-w` & IGNORE whitespace \tn 
% Row Count 12 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{3.04 cm} x{4.96 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Removal}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git rm README` & Remove file from git and locally \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
`git rm -{}-cached README` & Remove file from git, but keep locally as UNTRACKED \tn 
% Row Count 5 (+ 3)
% Row 2
\SetRowColor{LightBackground}
`git reset HEAD README` & UNSTAGE a file \tn 
% Row Count 7 (+ 2)
% Row 3
\SetRowColor{white}
`git checkout -{}- README` & Revert a file back to its form from the last commit \tn 
% Row Count 10 (+ 3)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{3.2 cm} x{4.8 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Stashing}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git stash` & Push all TRACKED modified files (`-u ` to include untracked, `-a` to include ignored) \tn 
% Row Count 4 (+ 4)
% Row 1
\SetRowColor{white}
`git stash list` & LIST all stashes \tn 
% Row Count 5 (+ 1)
% Row 2
\SetRowColor{LightBackground}
`git stash apply` & APPLY the last stash \tn 
% Row Count 7 (+ 2)
% Row 3
\SetRowColor{white}
`git stash apply stash@\{2\}` & APPLY a chosen stash \tn 
% Row Count 9 (+ 2)
% Row 4
\SetRowColor{LightBackground}
`git stash pop` & APPLY stash and DELETE it \tn 
% Row Count 11 (+ 2)
% Row 5
\SetRowColor{white}
`git stash drop` & DELETE stash \tn 
% Row Count 12 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{4 cm} x{4 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Remotes}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git remote -v` & LIST remotes with URLs \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
`git remote show \textless{}origin\textgreater{}` & GET details with tracked branches \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
`git remote add \textless{}origin\textgreater{} \textless{}url\textgreater{}` & ADD a remote \tn 
% Row Count 6 (+ 2)
% Row 3
\SetRowColor{white}
`git remote rename \textless{}origin\textgreater{} \textless{}upstream\textgreater{}` & RENAME remote origin to upstream \tn 
% Row Count 8 (+ 2)
% Row 4
\SetRowColor{LightBackground}
`git remote rm \textless{}origin\textgreater{}` & DELETE remote \tn 
% Row Count 10 (+ 2)
% Row 5
\SetRowColor{white}
`git push \textless{}origin\textgreater{} -{}-delete \textless{}feature/one\textgreater{}` & DELETE branch from remote \tn 
% Row Count 13 (+ 3)
% Row 6
\SetRowColor{LightBackground}
`git fetch origin` & FETCH all data from origin \tn 
% Row Count 15 (+ 2)
% Row 7
\SetRowColor{white}
`git pull` & FETCH and MERGE \tn 
% Row Count 16 (+ 1)
% Row 8
\SetRowColor{LightBackground}
`git push \textless{}origin\textgreater{} \textless{}master\textgreater{}` & PUSH branch to a remote \tn 
% Row Count 18 (+ 2)
% Row 9
\SetRowColor{white}
`git branch -vv` & Details of local branches and what they track \tn 
% Row Count 21 (+ 3)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{4.88 cm} x{3.12 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Tagging}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git tag` & LIST tags \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
`-l "119.*" & FILTER tags \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
`git tag -a v2.0 -m "Version 2.0"` & CREATE annotated tag \tn 
% Row Count 4 (+ 2)
% Row 3
\SetRowColor{white}
`git tag v2.0` & CREATE lightweight tag \tn 
% Row Count 6 (+ 2)
% Row 4
\SetRowColor{LightBackground}
`git show v2.0` & GET tag \tn 
% Row Count 7 (+ 1)
% Row 5
\SetRowColor{white}
`git tag -d v2.0` & DELETE tag \tn 
% Row Count 8 (+ 1)
% Row 6
\SetRowColor{LightBackground}
`git push \textless{}origin\textgreater{} \textless{}tag\textgreater{}` & PUSH single tag \tn 
% Row Count 10 (+ 2)
% Row 7
\SetRowColor{white}
`git push \textless{}origin\textgreater{} -{}-tags` & PUSH all tags \tn 
% Row Count 12 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{2.56 cm} x{5.44 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Rebasing}}  \tn
% Row 0
\SetRowColor{LightBackground}
`git rebase master` & Takes commits from current branch and applies them on top of master. Master stays on previous commit, only current branch is moved \tn 
% Row Count 5 (+ 5)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{x{4 cm} x{4 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Git Log}}  \tn
% Row 0
\SetRowColor{LightBackground}
`-p` & See differences in each commit \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
`-2` & Only 2 last commits \tn 
% Row Count 3 (+ 1)
% Row 2
\SetRowColor{LightBackground}
`master feature/one` & Only commits between master and feature/one \tn 
% Row Count 6 (+ 3)
% Row 3
\SetRowColor{white}
`-{}-all` & Commits from all branches \tn 
% Row Count 8 (+ 2)
% Row 4
\SetRowColor{LightBackground}
`-{}-stat` & See file change statistics \tn 
% Row Count 10 (+ 2)
% Row 5
\SetRowColor{white}
`-{}-pretty=oneline/short/full/fuller/format:\{some format\}` & Formatting of output \tn 
% Row Count 13 (+ 3)
% Row 6
\SetRowColor{LightBackground}
`-{}-oneline` & Shorthand for `-{}-pretty=oneline` \tn 
% Row Count 15 (+ 2)
% Row 7
\SetRowColor{white}
`-{}-graph` & Shows graph \tn 
% Row Count 16 (+ 1)
% Row 8
\SetRowColor{LightBackground}
`-{}-since=2.weeks/2010-01-15` (or `after`) & Commits from \tn 
% Row Count 19 (+ 3)
% Row 9
\SetRowColor{white}
`-{}-until=2021` (or `before`) & Commits to \tn 
% Row Count 21 (+ 2)
% Row 10
\SetRowColor{LightBackground}
`-{}-author=Joe` & Only by some author, can be used multiple times \tn 
% Row Count 24 (+ 3)
% Row 11
\SetRowColor{white}
`-{}-grep=word` & Filter by message content \tn 
% Row Count 26 (+ 2)
% Row 12
\SetRowColor{LightBackground}
`-S word` & Filter by commit that changed occurence of `word` in code \tn 
% Row Count 29 (+ 3)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{8.4cm}}{Example: `git log -{}-pretty="\%h - \%s" -{}-author='Junio C Hamano' -{}-since="2008-10-01" \textbackslash{} \newline -{}-before="2008-11-01" -{}-no-merges`}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{`-{}-pretty=format` options}}  \tn
\SetRowColor{LightBackground}
\mymulticolumn{1}{p{8.4cm}}{\vspace{1px}\centerline{\includegraphics[width=5.1cm]{/web/www.cheatography.com/public/uploads/loreno10_1596016449_Annotation 2020-07-29 115306.png}}} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Configuration}}  \tn
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{Git configuration is stored in 3 places: \newline % Row Count 1 (+ 1)
- `/etc/gitconfig` (`-{}-system`) \newline % Row Count 2 (+ 1)
- `\textasciitilde{}/.gitconfig` (`-{}-global`) \newline % Row Count 3 (+ 1)
- `.git/config` (`-{}-local`) \newline % Row Count 4 (+ 1)
Each level overwrites the previous one. \newline % Row Count 5 (+ 1)
Setting up: \newline % Row Count 6 (+ 1)
`git config -{}-global user.name "John Doe"` \newline % Row Count 7 (+ 1)
`git config -{}-global user.email johndoe@example.com` \newline % Row Count 9 (+ 2)
`git config -{}-global core.editor code` \newline % Row Count 10 (+ 1)
Check some setting:  \newline % Row Count 11 (+ 1)
`git config user.name` \newline % Row Count 12 (+ 1)
See all configuration and sources:  \newline % Row Count 13 (+ 1)
`git config -{}-list -{}-show-origin`% Row Count 14 (+ 1)
} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}


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

\end{document}