\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{guionardo} \pdfinfo{ /Title (git-flow-and-git.pdf) /Creator (Cheatography) /Author (guionardo) /Subject (Git Flow and 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}{0534A3} \definecolor{LightBackground}{HTML}{EFF2F9} \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 Flow and git Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{guionardo} via \textcolor{DarkBackground}{\uline{cheatography.com/87361/cs/21586/}}} \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}guionardo \\ \uline{cheatography.com/guionardo} \\ \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 15th January, 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} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Install}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{{\bf{Linux}}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{8.4cm}}{`apt-get install git-flow`} \tn % Row Count 2 (+ 1) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{{\bf{Windows (cygwin)}}} \tn % Row Count 3 (+ 1) % Row 3 \SetRowColor{white} \mymulticolumn{1}{x{8.4cm}}{`wget -q -O - -{}-no-check-certificate \seqsplit{https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh} install stable | bash`} \tn % Row Count 6 (+ 3) % Row 4 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{{\bf{macOS (homebrew)}}} \tn % Row Count 7 (+ 1) % Row 5 \SetRowColor{white} \mymulticolumn{1}{x{8.4cm}}{`brew install git-flow-avh`} \tn % Row Count 8 (+ 1) % Row 6 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{{\bf{macOS (macports)}}} \tn % Row Count 9 (+ 1) % Row 7 \SetRowColor{white} \mymulticolumn{1}{x{8.4cm}}{`port install git-flow-avh`} \tn % Row Count 10 (+ 1) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.68 cm} x{4.32 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Features / Create a branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow feature start MYFEATURE` & `git checkout -b feature/MYFEATURE develop` \tn % Row Count 4 (+ 3) \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}{Features / Get latest from branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow feature pull origin MYFEATURE` & `git checkout feature/MYFEATURE` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} & `git pull -{}-rebase origin feature/MYFEATURE` \tn % Row Count 6 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{1.76 cm} x{6.24 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Features / push merged branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} {\emph{N/A}} & `git push origin develop` \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} & `git push origin :feature/MYFEATURE` {\emph{(if pushed)}} \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}{Hotfixes / create branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow hotfix start 1.2.1 {[}commit{]}` & `git checkout -b hotfix/1.2.1 {[}commit{]}` \tn % Row Count 3 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{1.76 cm} x{6.24 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Hotfixes / Push merged branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} {\emph{N/A}} & `git push origin master` \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} & `git push origin develop` \tn % Row Count 4 (+ 1) % Row 3 \SetRowColor{white} & `git push origin -{}-tags` \tn % Row Count 5 (+ 1) % Row 4 \SetRowColor{LightBackground} & `git push origin :hotfix/1.2.1` {\emph{(if pushed)}} \tn % Row Count 7 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{1.76 cm} x{6.24 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Releases / Get latest for branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} {\emph{N/A}} & `git checkout release/1.2.0` \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} & `git pull -{}-rebase origin release/1.2.0` \tn % Row Count 5 (+ 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}{Releases / Finalize}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow release finish 1.2.0` & `git checkout master` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} & `git merge -{}-no-ff release/1.2.0` \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} & `git tag -a 1.2.0` \tn % Row Count 6 (+ 1) % Row 4 \SetRowColor{LightBackground} & `git checkout develop` \tn % Row Count 8 (+ 2) % Row 5 \SetRowColor{white} & `git merge -{}-no-ff release/1.2.0` \tn % Row Count 10 (+ 2) % Row 6 \SetRowColor{LightBackground} & `git branch -d release/1.2.0` \tn % Row Count 12 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{2.16 cm} x{5.84 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Initialize}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} `git flow init` & `git init` \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} & `git commit -{}-allow-empty -m "Initial commit"` \tn % Row Count 6 (+ 2) % Row 3 \SetRowColor{white} & `git checkout -b develop master` \tn % Row Count 8 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{1.76 cm} x{6.24 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Connect to the remote repository}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} {\emph{N/A}} & `git remote add origin \seqsplit{git@github.com:MYACCOUNT/MYREPO`} \tn % Row Count 4 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{4.08 cm} x{3.92 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Features / Share a branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow feature publish MYFEATURE` & `git checkout feature/MYFEATURE` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} & `git push origin feature/MYFEATURE` \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}{Features / Finalize branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow feature finish MYFEATURE` & `git checkout develop` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} & `git merge -{}-no-ff feature/MYFEATURE` \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} & `git branch -d feature/MYFEATURE` \tn % Row Count 7 (+ 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}{Hotfixes / Finalize branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow hotfix finish 1.2.1` & `git checkout master` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} & `git merge -{}-no-ff hotfix/1.2.1` \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} & `git tag -a 1.2.1` \tn % Row Count 6 (+ 1) % Row 4 \SetRowColor{LightBackground} & `git checkout develop` \tn % Row Count 8 (+ 2) % Row 5 \SetRowColor{white} & `git merge -{}-no-ff hotfix/1.2.1` \tn % Row Count 10 (+ 2) % Row 6 \SetRowColor{LightBackground} & `git branch -d hotfix/1.2.1` \tn % Row Count 12 (+ 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}{Releases / Create a branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow release start 1.2.0` & `git checkout -b release/1.2.0 develop` \tn % Row Count 3 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{4.08 cm} x{3.92 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Releases / Share branch}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 1 (+ 1) % Row 1 \SetRowColor{white} `git flow release publish 1.2.0` & `git checkout release/1.2.0` \tn % Row Count 3 (+ 2) % Row 2 \SetRowColor{LightBackground} & `git push origin release/1.2.0` \tn % Row Count 5 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{1.76 cm} x{6.24 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Releases / Push merged branc}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{gitflow}} & {\bf{git}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} {\emph{N/A}} & `git push origin master` \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} & `git push origin develop` \tn % Row Count 4 (+ 1) % Row 3 \SetRowColor{white} & `git push origin -{}-tags` \tn % Row Count 5 (+ 1) % Row 4 \SetRowColor{LightBackground} & `git push origin :release/1.2.0` {\emph{(if pushed)}} \tn % Row Count 7 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{References}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{\seqsplit{https://gist.github.com/JamesMGreene/cdd0ac49f90c987e45ac\#file-gitflow-breakdown-md}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} \mymulticolumn{1}{x{8.4cm}}{\seqsplit{https://danielkummer.github.io/git-flow-cheatsheet/index.pt\_BR.html}} \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{\seqsplit{https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow}} \tn % Row Count 6 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}