\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{sertalpbilal} \pdfinfo{ /Title (git-commands.pdf) /Creator (Cheatography) /Author (sertalpbilal) /Subject (Git Commands 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}{A30D0D} \definecolor{LightBackground}{HTML}{FCF7F7} \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 Commands Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{sertalpbilal} via \textcolor{DarkBackground}{\uline{cheatography.com/121942/cs/22478/}}} \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}sertalpbilal \\ \uline{cheatography.com/sertalpbilal} \\ \end{tabulary} \vfill \columnbreak \begin{tabulary}{5.8cm}{L} \SetRowColor{FootBackground} \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}} \\ \vspace{-2pt}Published 21st April, 2020.\\ Updated 21st April, 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{3.28 cm} x{4.72 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Main Commands}} \tn % Row 0 \SetRowColor{LightBackground} git init & Create git repository here (decentralized) \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git init -{}-bare & Create bare git repository (centralized) \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git clone {\emph{repo}} & Clone repository at address {\emph{repo}} \tn % Row Count 6 (+ 2) % Row 3 \SetRowColor{white} git clone -b {\emph{branch}} {\emph{repo}} & Clone {\emph{branch}} from repository \tn % Row Count 8 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{4.48 cm} x{3.52 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Status}} \tn % Row 0 \SetRowColor{LightBackground} git status & List changes \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} git status -{}-short -{}-branch & List changes (compact) \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} git log & Display commit history \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} git log -{}-oneline -{}-decorate -{}-graph -{}-all & Display visual commit history \tn % Row Count 7 (+ 2) % Row 4 \SetRowColor{LightBackground} git config -{}-global core.autocrlf true & Ignore OS-specific line endings \tn % Row Count 9 (+ 2) \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}{Commits}} \tn % Row 0 \SetRowColor{LightBackground} git add {\emph{hello.py}} & Add {\emph{hello.py}} (or stage changes) for next commit \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git rm -{}-cached {\emph{hello.py}} & Remove {\emph{hello.py}} from git tracking \tn % Row Count 5 (+ 2) % Row 2 \SetRowColor{LightBackground} git checkout -{}- {\emph{hello.py}} & Discard all local changes to {\emph{hello.py}} \tn % Row Count 7 (+ 2) % Row 3 \SetRowColor{white} git add -u & Stage all changes under tracking \tn % Row Count 9 (+ 2) % Row 4 \SetRowColor{LightBackground} git add -A & Stage all changes (new files and deletions included) \tn % Row Count 12 (+ 3) % Row 5 \SetRowColor{white} git update-index -{}-assume-unchanged {\emph{hello.py}} & Ignore changes to {\emph{hello.py}} locally \tn % Row Count 15 (+ 3) % Row 6 \SetRowColor{LightBackground} git add -{}-interactive & Review and stage changes \tn % Row Count 17 (+ 2) % Row 7 \SetRowColor{white} git commit & Create a commit (snapshot) \tn % Row Count 19 (+ 2) % Row 8 \SetRowColor{LightBackground} git commit -m "{\emph{message}}" & Create a commit with message \tn % Row Count 21 (+ 2) % Row 9 \SetRowColor{white} git commit -a & Commit every change under tracking \tn % Row Count 23 (+ 2) % Row 10 \SetRowColor{LightBackground} git commit -ammend & Combine current and last commit (correction) \tn % Row Count 26 (+ 3) % Row 11 \SetRowColor{white} git diff & Show all unstaged differences \tn % Row Count 28 (+ 2) % Row 12 \SetRowColor{LightBackground} git diff -{}-cached & Show all differences including staged ones \tn % Row Count 31 (+ 3) \end{tabularx} \par\addvspace{1.3em} \vfill \columnbreak \begin{tabularx}{8.4cm}{x{4 cm} x{4 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Commits (cont)}} \tn % Row 13 \SetRowColor{LightBackground} git diff {\emph{branch1}}..{\emph{branch2}} & See differences between {\emph{branch1}} and {\emph{branch2}} \tn % Row Count 3 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \SetRowColor{LightBackground} \mymulticolumn{2}{x{8.4cm}}{You can use commits instead of branch names. {\emph{HEAD}} refers to current point in git.} \tn \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}{Reseting}} \tn % Row 0 \SetRowColor{LightBackground} git reset -{}-soft {\emph{commit}} & Stage all changes since {\emph{commit}} (used for squashing) \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git reset -{}-hard & Discard all local changes and reset to last commit \tn % Row Count 6 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.52 cm} x{4.48 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Maintenance}} \tn % Row 0 \SetRowColor{LightBackground} git revert {\emph{commit}} & Creates a new commit out of an old commit (turn back in history) \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git clean -dfx & Delete all untracked files and directories\{\{nl\}\}\{\{fa-exclamation\}\}Dangerous \tn % Row Count 7 (+ 4) % Row 2 \SetRowColor{LightBackground} git clean -dfxn & Dry run - Show which files will be deleted \tn % Row Count 9 (+ 2) % Row 3 \SetRowColor{white} git gc -{}-aggressive -{}-prune=now & Reduce file size of repository by pruning \tn % Row Count 11 (+ 2) % Row 4 \SetRowColor{LightBackground} git checkout {\emph{file}} & Discard local changes to {\emph{file}} \tn % Row Count 13 (+ 2) % Row 5 \SetRowColor{white} bfg -delete-files {\emph{file}} & BFG cleans sensitive data {\emph{file}} \tn % Row Count 15 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.92 cm} x{4.08 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Remote Management}} \tn % Row 0 \SetRowColor{LightBackground} git remote add {\emph{target}} {\emph{repo}} & Add remote {\emph{target}} at address {\emph{repo}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git remote -v & List all remotes \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} git remote set-url {\emph{target}} {\emph{repo}} & Changes the address of remote {\emph{target}} \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} git push -f {\emph{origin}} {\emph{commit}}:{\emph{master}} & Forces {\emph{origin/master}} branch to be moved to {\emph{commit}} \tn % Row Count 8 (+ 3) % Row 4 \SetRowColor{LightBackground} git pull (-{}-rebase) {\emph{target}} {\emph{branch}} & Push existing commit to {\emph{target/branch}} \tn % Row Count 10 (+ 2) % Row 5 \SetRowColor{white} git push {\emph{target}} {\emph{branch}} & Push {\emph{branch}} to {\emph{target/branch}} \tn % Row Count 12 (+ 2) % Row 6 \SetRowColor{LightBackground} git push {\emph{target}} {\emph{branch1:branch2}} & Push local {\emph{branch1}} to {\emph{target/branch2}} \tn % Row Count 14 (+ 2) % Row 7 \SetRowColor{white} git push -u {\emph{target}} {\emph{branch}} & Push and track {\emph{target/branch}}. It sets upstream for default pull / push \tn % Row Count 18 (+ 4) % Row 8 \SetRowColor{LightBackground} git push {\emph{target}} -{}-delete {\emph{branch}} & Deletes {\emph{target/branch}} at remote \tn % Row Count 20 (+ 2) % Row 9 \SetRowColor{white} git fetch {\emph{target}} & Update branch information of {\emph{target}} remote \tn % Row Count 23 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \SetRowColor{LightBackground} \mymulticolumn{2}{x{8.4cm}}{Note: {\emph{repo}} might start with `git@` or `https`. When it starts with `git@` an SSH key is needed for pull/push operations.} \tn \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}{Branch management}} \tn % Row 0 \SetRowColor{LightBackground} git checkout {\emph{target}} & Switch to {\emph{target}} branch \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git checkout -b {\emph{feature}} & Create new branch from current commit \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git checkout -b {\emph{feature}} {\emph{master}} & Create new branch {\emph{feature}} from {\emph{master}} branch \tn % Row Count 7 (+ 3) % Row 3 \SetRowColor{white} git branch -a & List all branches \tn % Row Count 8 (+ 1) % Row 4 \SetRowColor{LightBackground} git branch -r -{}-merged master & List remote branches that are merged with {\emph{master}} \tn % Row Count 11 (+ 3) % Row 5 \SetRowColor{white} git merge {\emph{feature}} & Merge {\emph{feature}} branch into current branch \tn % Row Count 14 (+ 3) % Row 6 \SetRowColor{LightBackground} git merge -{}-no-ff {\emph{feature}} -m "{\emph{message}}" & Merge {\emph{feature}} with a commit (no fast-forward) \tn % Row Count 17 (+ 3) % Row 7 \SetRowColor{white} git branch -d {\emph{feature}} & Delete {\emph{feature}} branch (if already merged) \tn % Row Count 20 (+ 3) % Row 8 \SetRowColor{LightBackground} git branch -D {\emph{feature}} & Force delete {\emph{feature}} branch\{\{nl\}\}\{\{fa-exclamation\}\} Dangerous \tn % Row Count 24 (+ 4) % Row 9 \SetRowColor{white} git branch -f {\emph{feature}} {\emph{commit}} & Move branch head {\emph{feature}} to {\emph{commit}}\{\{nl\}\}\{\{fa-exclamation\}\} Dangerous \tn % Row Count 28 (+ 4) \hhline{>{\arrayrulecolor{DarkBackground}}--} \SetRowColor{LightBackground} \mymulticolumn{2}{x{8.4cm}}{Use \newline `git for-each-ref -{}-sort=committerdate refs/heads/ -{}-format='\%(HEAD) \%(refname:short) - \%(objectname:short) - \%(contents:subject) - \%(authorname) \seqsplit{(\%(committerdate:relative))'`} \newline to print summary of each branch, last commit, and other info} \tn \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}{Tag management}} \tn % Row 0 \SetRowColor{LightBackground} git tag -a {\emph{v1.0.0}} -m "{\emph{message}}" & Creates an annotated tag with message \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git push {\emph{target}} -{}-tags & Push local tags to remote {\emph{target}} \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git tag -d {\emph{v1.0.0}} & Delete local tag *v1.0.0" \tn % Row Count 6 (+ 2) % Row 3 \SetRowColor{white} git push {\emph{target}} :refs/tags/{\emph{v1.0.0}} & Delete remote tag {\emph{target/v1.0.0}} \tn % Row Count 8 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.52 cm} x{4.48 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Semantic Versioning}} \tn % Row 0 \SetRowColor{LightBackground} git describe -{}-tags -{}-dirty & Describe current commit using tags \tn % Row Count 2 (+ 2) \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}{Submodules}} \tn % Row 0 \SetRowColor{LightBackground} git submodule update -{}-init -{}-recursive . & Pull all submodules (linked repositories) \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git submodule status {\emph{folder}} & Show the status of submodule under {\emph{folder}} \tn % Row Count 6 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}