\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{mivasi} \pdfinfo{ /Title (thomastraingit.pdf) /Creator (Cheatography) /Author (mivasi) /Subject (ThomasTrainGit 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}{A32A12} \definecolor{LightBackground}{HTML}{F9F1F0} \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{ThomasTrainGit Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{mivasi} via \textcolor{DarkBackground}{\uline{cheatography.com/36011/cs/11333/}}} \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}mivasi \\ \uline{cheatography.com/mivasi} \\ \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, 2017.\\ 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}{Installation and setup}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{\{\{link="https://git-scm.com/downloads"\}\}https://git-scm.com/downloads\{\{/link\}\}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{8.4cm}}{`git config -{}-global user.name "John Doe"`} \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{`git config -{}-global user.email johndoe@example.com`} \tn % Row Count 5 (+ 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}{Get repository}} \tn % Row 0 \SetRowColor{LightBackground} git clone {\emph{\textless{}url\textgreater{}}} & use {\bf{ssh}} not {\emph{https}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git init & new local repository \tn % Row Count 3 (+ 1) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{4.72 cm} x{3.28 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Basic workflow}} \tn % Row 0 \SetRowColor{LightBackground} what I have edited & `git status` \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} mark for commit (move to green) & `git add \textless{}file\textgreater{}` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} commit from staging (green area) & `git commit` \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} look at my commit in history & `git log` \tn % Row Count 7 (+ 2) % Row 4 \SetRowColor{LightBackground} push to server & `git push origin \textless{}branch\textgreater{}` \tn % Row Count 9 (+ 2) % Row 5 \SetRowColor{white} download and merge latest server work & `git pull origin \textless{}branch\textgreater{}` \tn % Row Count 11 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.84 cm} x{4.16 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Resolve conflict}} \tn % Row 0 \SetRowColor{LightBackground} see conflicting files & `git status` \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} abort merge & `git merge -{}-abort` \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} accept only my changes & `git checkout -{}-ours \textless{}file\textgreater{}` \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} accept only incoming changes & `git checkout -{}-theirs \textless{}file\textgreater{}` \tn % Row Count 7 (+ 2) % Row 4 \SetRowColor{LightBackground} mark conflict as resolved & `git add \textless{}file\textgreater{}` \tn % Row Count 9 (+ 2) % Row 5 \SetRowColor{white} finish merge & `git commit` \tn % Row Count 10 (+ 1) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{4.24 cm} x{3.76 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Branching}} \tn % Row 0 \SetRowColor{LightBackground} create and switch to branch & `git checkout -b \textless{}name\textgreater{}` \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} list local branches & `git branch` \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} switch active branch & `git checkout \textless{}name\textgreater{}` \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} merge branch & `git merge \textless{}name\textgreater{}` \tn % Row Count 6 (+ 1) % Row 4 \SetRowColor{LightBackground} delete branch & `git branch -D \textless{}name\textgreater{}` \tn % Row Count 8 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.12 cm} x{4.88 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Tag}} \tn % Row 0 \SetRowColor{LightBackground} new tag & `git tag \textless{}name\textgreater{}` \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} list of tags & `git tag` \tn % Row Count 2 (+ 1) % Row 2 \SetRowColor{LightBackground} remove tag & `git tag -d \textless{}name\textgreater{}` \tn % Row Count 3 (+ 1) \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}{Remove edits}} \tn % Row 0 \SetRowColor{LightBackground} from stage to changes (green to red) & `git reset HEAD \textless{}file\textgreater{}` \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} remove edits & `git checkout \textless{}file\textgreater{}` \tn % Row Count 4 (+ 2) \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}{Stash}} \tn % Row 0 \SetRowColor{LightBackground} move edits to stash & `git stash` \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} apply topmost stashed edits & `git stash apply` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} clear stash & `git stash clear` \tn % Row Count 5 (+ 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}{Tips}} \tn % Row 0 \SetRowColor{LightBackground} get branch to server state & `git reset -{}-hard origin/\textless{}branch\textgreater{}` \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} load up sources from prev. commit & `git checkout HEAD\textasciicircum{}` \tn % Row Count 4 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}