\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{James (realjimbob)} \pdfinfo{ /Title (git.pdf) /Creator (Cheatography) /Author (James (realjimbob)) /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}{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 Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{James (realjimbob)} via \textcolor{DarkBackground}{\uline{cheatography.com/130441/cs/25956/}}} \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}James (realjimbob) \\ \uline{cheatography.com/realjimbob} \\ \end{tabulary} \vfill \columnbreak \begin{tabulary}{5.8cm}{L} \SetRowColor{FootBackground} \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}} \\ \vspace{-2pt}Published 5th February, 2021.\\ Updated 11th February, 2021.\\ 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} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Configuration}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Set or show Git configuration options:\{\{nl\}\}`git config {[} -{}-global {]} {[} -{}-get {]} \textless{}name\textgreater{} {[} \textless{}value\textgreater{} {]}`\{\{nl\}\}`git config {[} -l | -{}-list {]}`} \tn % Row Count 3 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{To set user's name and email address: \newline `git config -{}-global user.name "Firstname Lastname"` \newline `git config -{}-global user.email \seqsplit{"firstname.lastname@org.com"`} \newline By default local settings are stored in the project's repository, global settings are stored in the user's home directory.} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Repository Setup}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Initialise a local repository:\{\{nl\}\}`git init`} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Clone a remote repository:\{\{nl\}\}`git clone \textless{}URL\textgreater{} {[} \textless{}local\_dir\textgreater{} {]}`\{\{nl\}\}The URL can use HTTP or SSH etc.} \tn % Row Count 4 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Basic Commands}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Show the working tree status:\{\{nl\}\}`git status {[} -s | -{}-short {]}`} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Add files from the working folder to the index:\{\{nl\}\}`git add \textless{}filespec\textgreater{}`} \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Save changes from the index to the repository:\{\{nl\}\}`git commit {[} -a {]} {[} -m \textless{}message\textgreater{} {]}`} \tn % Row Count 6 (+ 2) % Row 3 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Show changes between references:\{\{nl\}\}`git diff {[} -{}-staged {]} {[} -{}-no-renames {]}\{\{nl\}\}git diff \textless{}commit\textgreater{} {[} \textless{}commit\textgreater{} {]} {[} \textless{}file\textgreater{} {]}\{\{nl\}\}git diff \textless{}commit\textgreater{}...\textless{}commit\textgreater{}`} \tn % Row Count 10 (+ 4) % Row 4 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Show commit logs:\{\{nl\}\}`git log {[} -\textless{}n\textgreater{} {]} {[} -{}-oneline {]} {[} -{}-patch {]} {[} \textless{}branch\textgreater{} {]}`} \tn % Row Count 12 (+ 2) % Row 5 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Remove files from working tree and index:\{\{nl\}\}`git rm {[} -{}-cached {]} \textless{}filename\textgreater{}`} \tn % Row Count 14 (+ 2) % Row 6 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Move or rename a file:\{\{nl\}\}`git mv \textless{}filename\textgreater{} \textless{}destination\textgreater{}`} \tn % Row Count 16 (+ 2) % Row 7 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Reset current HEAD in the repository:\{\{nl\}\}`git reset {[} -{}-soft | -{}-mixed | -{}-hard {]} \textless{}sha1\textgreater{}`} \tn % Row Count 18 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Commit Messages}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{1. Divide subject and body with blank line \newline % Row Count 1 (+ 1) 2. Limit the subject length to 50 characters \newline % Row Count 2 (+ 1) 3. Capitalise the subject line \newline % Row Count 3 (+ 1) 4. Do not end the subject line with a full stop \newline % Row Count 4 (+ 1) 5. Use imperative mood in the subject line \newline % Row Count 5 (+ 1) 6. Wrap the body at 72 characters \newline % Row Count 6 (+ 1) 7 Use body to explain what \& why, not how% Row Count 7 (+ 1) } \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{\seqsplit{https://chris.beams.io/posts/git-commit/}} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Managing Remotes}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Add and track remote repositories:\{\{nl\}\}`git remote add \textless{}remote\textgreater{} \textless{}URL\textgreater{}`} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{List remote repositories:\{\{nl\}\}`git remote {[} -v | -{}-verbose {]}`} \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Update local repositories:\{\{nl\}\}`git pull {[} \textless{}remote\textgreater{} {[} \textless{}branch\textgreater{} {]} {]}`} \tn % Row Count 6 (+ 2) % Row 3 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Update remote repositories:\{\{nl\}\}`git push {[} -u {]} {[} \textless{}remote\textgreater{} {[} \textless{}branch\textgreater{} {]} {]}`} \tn % Row Count 8 (+ 2) % Row 4 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Download changes from remote repository:\{\{nl\}\}`git fetch {[} \textless{}remote\textgreater{} {[} \textless{}branch\textgreater{} {]} {]}`} \tn % Row Count 10 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Managing Branches}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{List, create, rename and delete branches:\{\{nl\}\}`git branch {[} -{}-all {]} {[} {[} -m {[} \textless{}oldbranch\textgreater{} {]} {]} | {[} -d {]} | {[} -D {]} \textless{}branch\textgreater{} {]}`} \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Switch branches:\{\{nl\}\}`git checkout {[} -b {]} {[} -{}-track {]} \textless{}branch\textgreater{}`} \tn % Row Count 5 (+ 2) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Join branch histories together:\{\{nl\}\}`git merge \textless{}branch\textgreater{}\{\{nl\}\}git merge -{}-abort`} \tn % Row Count 7 (+ 2) % Row 3 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Rebase your branch:\{\{nl\}\}`git rebase {[} -i {]} \textless{}branch\textgreater{} | \textless{}commit\textgreater{}`} \tn % Row Count 9 (+ 2) % Row 4 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Tag a commit:\{\{nl\}\}`git tag {[} -a {]} \textless{}tag\textgreater{} {[} -m \textless{}message\textgreater{} {]}`} \tn % Row Count 11 (+ 2) % Row 5 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Compare branches:\{\{nl\}\}`git diff \textless{}branch1\textgreater{} \textless{}branch2\textgreater{}`} \tn % Row Count 13 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Stash Management}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Stash the changes from the working tree:\{\{nl\}\}`git stash {[} -u {]}`\{\{nl\}\}`git stash {[} list | show | pop {]} {[} \textless{}stash\textgreater{} {]}`} \tn % Row Count 3 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Plumbing Commands}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Show the contents of objects in the repository:\{\{nl\}\}`git cat-file -t | -p \textless{}sha1\textgreater{}`} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Count the number of objects in the repository:\{\{nl\}\}`git count-objects`} \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{`git show-ref \textless{}branch\textgreater{}`} \tn % Row Count 5 (+ 1) % Row 3 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Find common ancestor commit:\{\{nl\}\}`git merge-base \textless{}branch1\textgreater{} \textless{}branch2\textgreater{}`} \tn % Row Count 7 (+ 2) % Row 4 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Copy specific commits:\{\{nl\}\}`git cherry-pick \textless{}commit\textgreater{}`} \tn % Row Count 9 (+ 2) % Row 5 \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{List remote references:\{\{nl\}\}`git ls-remote`} \tn % Row Count 10 (+ 1) % Row 6 \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Set files to no longer track changes:\{\{nl\}\}`git update-index -{}-assume-unchanged \textless{}file\textgreater{}`} \tn % Row Count 12 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}