\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{leenmajz} \pdfinfo{ /Title (git-commands-basics.pdf) /Creator (Cheatography) /Author (leenmajz) /Subject (Git Commands Basics 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}{8962A3} \definecolor{LightBackground}{HTML}{F7F5F9} \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 Basics Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{leenmajz} via \textcolor{DarkBackground}{\uline{cheatography.com/198109/cs/42841/}}} \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}leenmajz \\ \uline{cheatography.com/leenmajz} \\ \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 31st March, 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*}{2} \begin{tabularx}{8.4cm}{x{4.8 cm} x{3.2 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Configuration}} \tn % Row 0 \SetRowColor{LightBackground} git config -{}-global user.name "Your Name" & Set your username globally. \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git config -{}-global user.email \seqsplit{"your.email@example.com"} & Set your email globally \tn % Row Count 5 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{1.36 cm} x{6.64 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Starting a Repository}} \tn % Row 0 \SetRowColor{LightBackground} git init & Initialize a new Git repository in the current directory. \tn % Row Count 2 (+ 2) \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}{Basic Workflow}} \tn % Row 0 \SetRowColor{LightBackground} git status & Check the status of your working directory and staging area \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git add \textless{}file\textgreater{} & Add a file to the staging area. \tn % Row Count 5 (+ 2) % Row 2 \SetRowColor{LightBackground} git commit -m "Commit message" & Commit changes with a descriptive message \tn % Row Count 7 (+ 2) % Row 3 \SetRowColor{white} git commit -am "Commit message" & Add and commit changes in one step (only for modified files, not new files). \tn % Row Count 11 (+ 4) % Row 4 \SetRowColor{LightBackground} git add submodule \textless{}link\textgreater{} \textless{}Directory\textgreater{} & Adding a submodule \tn % Row Count 13 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.36 cm} x{4.64 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Branching}} \tn % Row 0 \SetRowColor{LightBackground} git branch & List all local branches \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} git branch \textless{}branch\_name\textgreater{} & Create a new branch \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} git checkout \textless{}branch\_name\textgreater{} & Switch to a different branch \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} git checkout -b \textless{}branch\_name\textgreater{} & Create and switch to a new branch in one step \tn % Row Count 7 (+ 2) % Row 4 \SetRowColor{LightBackground} git merge \textless{}branch\_name\textgreater{} & Merge changes from \textless{}branch\_name\textgreater{} into the current branch \tn % Row Count 10 (+ 3) % Row 5 \SetRowColor{white} git branch -d \textless{}branch\_name\textgreater{} & Deleting a branch \tn % Row Count 12 (+ 2) \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}{Remote Repositories}} \tn % Row 0 \SetRowColor{LightBackground} git remote add \textless{}name\textgreater{} \textless{}url\textgreater{} & Add a new remote repository \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git remote -v & List all remote repositories \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git pull \textless{}remote\textgreater{} \textless{}branch\textgreater{} & Fetch changes from the remote repository and merge them into the current branch \tn % Row Count 8 (+ 4) % Row 3 \SetRowColor{white} git push \textless{}remote\textgreater{} \textless{}branch\textgreater{} & Push changes from the local repository to the remote \tn % Row Count 11 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{2.8 cm} x{5.2 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Inspecting Changes}} \tn % Row 0 \SetRowColor{LightBackground} git log & View commit history \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} git diff & Show changes between commits, commit and working tree, etc \tn % Row Count 4 (+ 3) % Row 2 \SetRowColor{LightBackground} git show \textless{}commit\_hash\textgreater{} & Show details of a specific commit \tn % Row Count 6 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.44 cm} x{4.56 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Undoing Changes}} \tn % Row 0 \SetRowColor{LightBackground} git reset HEAD \textless{}file\textgreater{} & Unstage a file from the staging area. \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git checkout -{}- \textless{}file\textgreater{} & Discard changes in the working directory for a specific file \tn % Row Count 5 (+ 3) % Row 2 \SetRowColor{LightBackground} git reset -{}-hard \textless{}commit\_hash\textgreater{} & Reset the repository to a specific commit (WARNING: this is a destructive operation). \tn % Row Count 9 (+ 4) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.44 cm} x{4.56 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Miscellaneous}} \tn % Row 0 \SetRowColor{LightBackground} git clone \textless{}repository\_url\textgreater{} & Clone a remote repository to your local machine \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git pull & Fetch changes from the remote repository and merge them into the current branch \tn % Row Count 7 (+ 4) % Row 2 \SetRowColor{LightBackground} git push & Push changes from the local repository to the remote repository \tn % Row Count 10 (+ 3) % Row 3 \SetRowColor{white} git submodule update –remote & Updating submodule \tn % Row Count 12 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.36 cm} x{4.64 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Optional tags}} \tn % Row 0 \SetRowColor{LightBackground} -a, -{}-all & Includes all changes (both tracked and untracked files) when executing the command \tn % Row Count 4 (+ 4) % Row 1 \SetRowColor{white} -m, -{}-message \textless{}message\textgreater{} & Specifies a commit message inline with the command \tn % Row Count 7 (+ 3) % Row 2 \SetRowColor{LightBackground} -b, -{}-branch \textless{}branch\_name\textgreater{} & Specifies the branch name when creating a new branch or switching branches \tn % Row Count 11 (+ 4) % Row 3 \SetRowColor{white} -f, -{}-force & Forces the command to execute, even if it would result in data loss or conflicts \tn % Row Count 15 (+ 4) % Row 4 \SetRowColor{LightBackground} -t, -{}-tags & Pushes tags along with the commits when pushing changes to a remote repository \tn % Row Count 19 (+ 4) % Row 5 \SetRowColor{white} -u, -{}-set-upstream \textless{}upstream\textgreater{} & Sets the upstream branch for the current branch \tn % Row Count 22 (+ 3) % Row 6 \SetRowColor{LightBackground} -v, -{}-verbose & Provides more detailed output, often helpful for debugging or understanding what the command is doing \tn % Row Count 27 (+ 5) % Row 7 \SetRowColor{white} -p, -{}-patch & Allows for interactive patching of changes (e.g., for selecting specific changes to include in a commit) \tn % Row Count 32 (+ 5) \end{tabularx} \par\addvspace{1.3em} \vfill \columnbreak \begin{tabularx}{8.4cm}{x{3.36 cm} x{4.64 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Optional tags (cont)}} \tn % Row 8 \SetRowColor{LightBackground} -d, -{}-delete & Deletes a branch or tag \tn % Row Count 1 (+ 1) % Row 9 \SetRowColor{white} -i, -{}-interactive & Runs the command in interactive mode, allowing for user input and interaction \tn % Row Count 5 (+ 4) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}