\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{k.mate555}
\pdfinfo{
  /Title (git-and-github.pdf)
  /Creator (Cheatography)
  /Author (k.mate555)
  /Subject (git \& github 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 \& github Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{k.mate555} via \textcolor{DarkBackground}{\uline{cheatography.com/200161/cs/42309/}}}
\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}k.mate555 \\
  \uline{cheatography.com/k-mate555} \\
  \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 6th February, 2024.\\
   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}{p{0.59724 cm} x{4.37976 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Basics}}  \tn
% Row 0
\SetRowColor{LightBackground}
glo & git log -{}-oneline -{}-decorate \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
gsw & git switch \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
gswc & git switch -c \{branch\_name\} \tn 
% Row Count 3 (+ 1)
% Row 3
\SetRowColor{white}
gswm & git switch \$\{git\_main\_branch\} \tn 
% Row Count 4 (+ 1)
% Row 4
\SetRowColor{LightBackground}
gcam & git commit -a(ll) -m(essage) \tn 
% Row Count 5 (+ 1)
% Row 5
\SetRowColor{white}
gaa & git add -{}-all \tn 
% Row Count 6 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{1.84149 cm} x{3.13551 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Time travel}}  \tn
% Row 0
\SetRowColor{LightBackground}
gco \{commit-hash\} & visit previous commit (detached HEAD) \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
gco HEAD\textasciitilde{}\{n\} & commit n before current head \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
gswc - & get back to prev checked out branch \tn 
% Row Count 6 (+ 2)
% Row 3
\SetRowColor{white}
gco HEAD \{file(s)\} & revert file(s) to last commit status \tn 
% Row Count 8 (+ 2)
% Row 4
\SetRowColor{LightBackground}
grss \{commit\} \{file(s)\} & restore files to state from given commit ref \tn 
% Row Count 10 (+ 2)
% Row 5
\SetRowColor{white}
grh \{commit\} & reset repo back to commit hash, commits are GONE \tn 
% Row Count 12 (+ 2)
% Row 6
\SetRowColor{LightBackground}
grhh \{commit\} & reset -{}-hard - lose commits + ALSO REMOVE FROM WORKDIR \tn 
% Row Count 15 (+ 3)
% Row 7
\SetRowColor{white}
grev \{commit\} & revert - create commit undoing changes \tn 
% Row Count 17 (+ 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}{Diff}}  \tn
% Row 0
\SetRowColor{LightBackground}
gd & all diffs that are not staged \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
gd HEAD & changes since HEAD/last commit \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
gdca & only staged \tn 
% Row Count 5 (+ 1)
% Row 3
\SetRowColor{white}
gb \{branch1..branch2\} & diff btw branches (or commits) \tn 
% Row Count 7 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{1.44333 cm} x{3.53367 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Remote}}  \tn
% Row 0
\SetRowColor{LightBackground}
gr -v & list remote URLs \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
gra \{name\} \{url\} & git remote add \tn 
% Row Count 3 (+ 2)
% Row 2
\SetRowColor{LightBackground}
ggp & git push origin \$\{current\_branch\} \tn 
% Row Count 5 (+ 2)
% Row 3
\SetRowColor{white}
gpsup & git push -{}-set upstream ... \tn 
% Row Count 6 (+ 1)
% Row 4
\SetRowColor{LightBackground}
gf & fetch (get changes to local repo but not to workdir) \tn 
% Row Count 8 (+ 2)
% Row 5
\SetRowColor{white}
gl & pull (default origin/current branch) \tn 
% Row Count 10 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{1.39356 cm} x{3.58344 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Rebase}}  \tn
% Row 0
\SetRowColor{LightBackground}
grb & git rebase \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
grbm & rebase \$\{git\_main\_branch\} \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
grb -i HEAD\textasciitilde{}\{n\} & recreate commits from n ago until HEAD \tn 
% Row Count 4 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{{[}WARNING{]} Don't rebase commits that are shared with / used by others!}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{p{0.64701 cm} x{4.32999 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Stash}}  \tn
% Row 0
\SetRowColor{LightBackground}
gsta & git stash (save) \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
gstp & git stash pop \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
gstaa & git stash apply (without popping) \tn 
% Row Count 3 (+ 1)
% Row 3
\SetRowColor{white}
gstl & git stash lit \tn 
% Row Count 4 (+ 1)
% Row 4
\SetRowColor{LightBackground}
gstc & git stash clear \tn 
% Row Count 5 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{2.14011 cm} x{2.83689 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Tags}}  \tn
% Row 0
\SetRowColor{LightBackground}
gts & git tag -s(ign) \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
gtv & git tag | sort -V \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
gco \{tag\} & check out particular tag \tn 
% Row Count 4 (+ 2)
% Row 3
\SetRowColor{white}
g tag \{tagname\} & lightweight tag at HEAD \tn 
% Row Count 6 (+ 2)
% Row 4
\SetRowColor{LightBackground}
g tag -a \{tagname\} & annotated tag at head \tn 
% Row Count 8 (+ 2)
% Row 5
\SetRowColor{white}
g push -{}-tags & push tags to origin \tn 
% Row Count 9 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{2.33919 cm} x{2.63781 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Reflogs}}  \tn
% Row 0
\SetRowColor{LightBackground}
g reflog show \{ref\} & ref eg HEAD or branch \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
gco HEAD@\{2\} & 2 moves ago in reflog \tn 
% Row Count 3 (+ 1)
% Row 2
\SetRowColor{LightBackground}
g reflog master@\{one.week.ago\} & show reflog until 1 week back \tn 
% Row Count 5 (+ 2)
% Row 3
\SetRowColor{white}
gd master master@\{yesterday\} & diff to yesterday \tn 
% Row Count 7 (+ 2)
% Row 4
\SetRowColor{LightBackground}
gco master@\{1.week.ago\} & checkout at closest matching entry \tn 
% Row Count 9 (+ 2)
% Row 5
\SetRowColor{white}
grh master@\{n\} & reset master to n moves ago \tn 
% Row Count 11 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{5.377cm}}{Reflogs are only local, and expire in \textasciitilde{}90 days Records all moves of pointers \& everything done in a repo locally, so we can revert things even after rebase, etc.}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}


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

\end{document}