\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{EzequielMuns (ezk)}
\pdfinfo{
  /Title (git-svn-for-beginners.pdf)
  /Creator (Cheatography)
  /Author (EzequielMuns (ezk))
  /Subject (Git-svn for Beginners 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}{BF4F0D}
\definecolor{LightBackground}{HTML}{FBF4EF}
\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-svn for Beginners Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{EzequielMuns (ezk)} via \textcolor{DarkBackground}{\uline{cheatography.com/2595/cs/799/}}}
\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}EzequielMuns (ezk) \\
  \uline{cheatography.com/ezk} \\
  \end{tabulary}
\vfill
\columnbreak
\begin{tabulary}{5.8cm}{L}
  \SetRowColor{FootBackground}
  \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}}  \\
   \vspace{-2pt}Published 22nd January, 2013.\\
   Updated 12th May, 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{2.14011 cm} x{2.83689 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Setting up a git svn working copy}}  \tn
% Row 0
\SetRowColor{LightBackground}
Checkout standard repository & git svn clone -s {\emph{svn-url}} {\emph{local-dir}} \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
Reflect \& track remote ignores & git svn show-ignore \textgreater{} .gitignore \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
Reflect remote ignores & git svn show-ignore \textgreater{}\textgreater{} .git/info/exclude \tn 
% Row Count 6 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{3.08574 cm} x{1.89126 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Normal git workflow}}  \tn
% Row 0
\SetRowColor{LightBackground}
Add file/stage changes (recursive) & git add {\emph{file}} \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
Remove file & git rm {[}-r{]} {\emph{file}} \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
Interactively stage changes & git add -i \tn 
% Row Count 6 (+ 2)
% Row 3
\SetRowColor{white}
Revert unstaged changes & git checkout {\emph{file}} \tn 
% Row Count 8 (+ 2)
% Row 4
\SetRowColor{LightBackground}
Revert staged changes & git reset HEAD {\emph{file}} \tn 
% Row Count 10 (+ 2)
% Row 5
\SetRowColor{white}
Commit staged changes & git commit \tn 
% Row Count 11 (+ 1)
% Row 6
\SetRowColor{LightBackground}
Add and commit all changes & git commit -a \tn 
% Row Count 13 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{2.33919 cm} x{2.63781 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Working with branches}}  \tn
% Row 0
\SetRowColor{LightBackground}
Create new branch & git branch {\emph{new-branch}} {[}{\emph{old-branch}}{]} \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
Move to a branch & git checkout {\emph{branch}} \tn 
% Row Count 3 (+ 1)
% Row 2
\SetRowColor{LightBackground}
Create and move to new branch & git checkout -b {\emph{new-branch}} {[}{\emph{old-branch}}{]} \tn 
% Row Count 6 (+ 3)
% Row 3
\SetRowColor{white}
List local branches & git branch \tn 
% Row Count 8 (+ 2)
% Row 4
\SetRowColor{LightBackground}
List local and remote (svn) branches & git branch -a \tn 
% Row Count 10 (+ 2)
% Row 5
\SetRowColor{white}
Merging a branch to current branch & git merge {\emph{other-branch}} \tn 
% Row Count 12 (+ 2)
% Row 6
\SetRowColor{LightBackground}
Merge a branch as single commit & git merge -{}-squash {\emph{other-branch}} \tn 
% Row Count 14 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{5.377cm}{x{3.43413 cm} x{1.54287 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Updating from and committing to svn}}  \tn
% Row 0
\SetRowColor{LightBackground}
Apply remote changes to local repo & git svn rebase \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
Commit changes back to Subversion & git svn dcommit \tn 
% Row Count 4 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}


% That's all folks
\end{multicols*}

\end{document}