\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{oisch} \pdfinfo{ /Title (hmi-git-gerrit.pdf) /Creator (Cheatography) /Author (oisch) /Subject (HMI Git/Gerrit 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}{1286A3} \definecolor{LightBackground}{HTML}{F0F7F9} \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{HMI Git/Gerrit Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{oisch} via \textcolor{DarkBackground}{\uline{cheatography.com/24089/cs/5471/}}} \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}oisch \\ \uline{cheatography.com/oisch} \\ \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 October, 2015.\\ Updated 15th July, 2016.\\ 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}{General}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{{\bf{Identifying a commit}} \newline % Row Count 1 (+ 1) Use first 4+ hash chars to identify a commit \newline % Row Count 2 (+ 1) `git checkout 3e95` = `git checkout \seqsplit{3e95b6ad46cafd97571b5c057e1ee5dace5c044b`}% Row Count 4 (+ 2) } \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}{Local changes}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Changes in your working directory \newline % Row Count 1 (+ 1) `git status` \newline % Row Count 2 (+ 1) Add a single file to the next commit \newline % Row Count 3 (+ 1) `git add {\emph{filename}}` \newline % Row Count 4 (+ 1) Add all current changes to the next commit \newline % Row Count 5 (+ 1) `git add .` \newline % Row Count 6 (+ 1) Create a new commit from the previously added files \newline % Row Count 8 (+ 2) `git commit` \newline % Row Count 9 (+ 1) Modify an existing commit with the previously added files \newline % Row Count 11 (+ 2) `git commit -{}-amend` \newline % Row Count 12 (+ 1) Delete all unversioned files \newline % Row Count 13 (+ 1) `git clean -f -n`% Row Count 14 (+ 1) } \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}{Working with branches}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Switching to a branch (HMI-123456) \newline % Row Count 1 (+ 1) `git checkout HMI-123456` \newline % Row Count 2 (+ 1) Pull HMI\_master and rebase on top of it \newline % Row Count 3 (+ 1) `git pull -{}-rebase HMI\_master` \newline % Row Count 4 (+ 1) List all branches \newline % Row Count 5 (+ 1) `git branch -a` \newline % Row Count 6 (+ 1) Delete a branch (HMI-123456) \newline % Row Count 7 (+ 1) `git branch -d HMI-123456` \newline % Row Count 8 (+ 1) Cherry pick commit HASH to current branch \newline % Row Count 9 (+ 1) `git cherry-pick {\emph{HASH}}`% Row Count 10 (+ 1) } \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}{Rewriting history}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Show last 3 commits \newline % Row Count 1 (+ 1) `git log -3` \newline % Row Count 2 (+ 1) Resetting to the previous commit (keep changes in workarea) \newline % Row Count 4 (+ 2) `git reset HEAD\textasciitilde{}1` \newline % Row Count 5 (+ 1) Resetting to the previous commit (revert changes) \newline % Row Count 6 (+ 1) `git reset -{}-hard HEAD\textasciitilde{}1` \newline % Row Count 7 (+ 1) Reset to any commit by hash \newline % Row Count 8 (+ 1) `git reset {\emph{HASH}}`% Row Count 9 (+ 1) } \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}{Gerrit / BCI}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{1. Create commit \newline % Row Count 1 (+ 1) `git add .` \newline % Row Count 2 (+ 1) `git commit -m "HMI-123456 test"` \newline % Row Count 3 (+ 1) 2. Create a new branch named HMI-123456 \newline % Row Count 4 (+ 1) `git checkout -b HMI-123456` \newline % Row Count 5 (+ 1) 3. Push the commit to Gerrit \newline % Row Count 6 (+ 1) `git push origin \seqsplit{HMI-123456:refs/for/HMI\_master\%topic=HMI-123456`} \newline % Row Count 8 (+ 2) or Push to Gerrit with mhg \newline % Row Count 9 (+ 1) `mgit ptg HMI-123456`% Row Count 10 (+ 1) } \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Ticket ID in the example is HMI-123456} \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}{Finding your change on Gerrit}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{Check the link in push to Gerrit output \newline % Row Count 1 (+ 1) `remote:` \newline % Row Count 2 (+ 1) `remote: Updated Changes:` \newline % Row Count 3 (+ 1) `remote: \{\{link="https://asc.bmwgroup.net/gerrit"\}\}https://asc.bmwgroup.net/gerrit/32677\{\{/link\}\}` \newline % Row Count 6 (+ 3) `remote:`% Row Count 7 (+ 1) } \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}{Monitoring build progress}} \tn \SetRowColor{white} \mymulticolumn{1}{x{5.377cm}}{\{\{link="https://ulmbci018.de-cci.bmwgroup.net:8082/job/PROCESS\_HMI\_GERRIT\_CHANGE\_TOPIC/"\}\}Has my topic build been triggered?\{\{/link\}\} \newline % Row Count 3 (+ 3) \{\{link="http://hmiee.muc:8008/ID6MhgGitGerritBciWorkflow\#View\_build\_console\_output\_for\_a\_change"\}\}View topic build console output for a change\{\{/link\}\} \newline % Row Count 7 (+ 4) Retriggering a topic build \newline % Row Count 8 (+ 1) `mgit tg HMI-123456`% Row Count 9 (+ 1) } \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}