\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{m4urice}
\pdfinfo{
  /Title (git-svn.pdf)
  /Creator (Cheatography)
  /Author (m4urice)
  /Subject (Git-SVN 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}{800101}
\definecolor{LightBackground}{HTML}{FBF7F7}
\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 Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{m4urice} via \textcolor{DarkBackground}{\uline{cheatography.com/25497/cs/6691/}}}
\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}m4urice \\
  \uline{cheatography.com/m4urice} \\
  \end{tabulary}
\vfill
\columnbreak
\begin{tabulary}{5.8cm}{L}
  \SetRowColor{FootBackground}
  \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}}  \\
   \vspace{-2pt}Published 20th January, 2016.\\
   Updated 13th 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{tabularx}{17.67cm}{x{4.5549 cm} x{6.2419 cm} x{6.0732 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{3}{x{17.67cm}}{\bf\textcolor{white}{Setting up a git-svn working copy}}  \tn
% Row 0
\SetRowColor{LightBackground}
Checkout an SVN \seqsplit{repository} & `git svn clone -s \textless{}url\_to\_svn\_repo\textgreater{} {[}-{}-prefix=origin/{]}` & The -s option is used to specify that the SVN repo has the standard file tree; the `-{}-prefix` option specifies the prefix for remote branches naming \tn 
% Row Count 11 (+ 11)
% Row 1
\SetRowColor{white}
Reflect \& track remote ignores & `git svn show-ignore \textgreater{} .gitignore` &  \tn 
% Row Count 14 (+ 3)
\hhline{>{\arrayrulecolor{DarkBackground}}---}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{5.061 cm} x{5.061 cm} x{6.748 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{3}{x{17.67cm}}{\bf\textcolor{white}{Staging and committing changes}}  \tn
% Row 0
\SetRowColor{LightBackground}
Add file/stage changes & `git add \textless{}file\textgreater{} {[}-{}-all{]}` & The command is recursive; the `-{}-all` option forces to stage deletions \tn 
% Row Count 5 (+ 5)
% Row 1
\SetRowColor{white}
Commit staged changes & `git commit {[}-m \textless{}message\textgreater{}{]}` &  \tn 
% Row Count 8 (+ 3)
% Row 2
\SetRowColor{LightBackground}
Add and commit all changes & `git commit -a {[}-m \textless{}message\textgreater{}{]}` &  \tn 
% Row Count 11 (+ 3)
% Row 3
\SetRowColor{white}
Commit changes to the SVN repo & `git svn dcommit {[}-{}-rmdir{]}` & The `-{}-rmdir` option forces the deletion of empty directories \tn 
% Row Count 15 (+ 4)
\hhline{>{\arrayrulecolor{DarkBackground}}---}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{4.7236 cm} x{4.3862 cm} x{7.7602 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{3}{x{17.67cm}}{\bf\textcolor{white}{Undoing things}}  \tn
% Row 0
\SetRowColor{LightBackground}
Revert unstaged changes & `git checkout \textless{}file\textgreater{}` &  \tn 
% Row Count 3 (+ 3)
% Row 1
\SetRowColor{white}
Revert staged changes & `git reset HEAD \textless{}file\textgreater{}` &  \tn 
% Row Count 6 (+ 3)
% Row 2
\SetRowColor{LightBackground}
Revert committed changes & `git revert \textless{}rev\_hash\textgreater{}` & The revision hash can be `HEAD` if you want to undo your latest commit (see the documentation of the `revert` subcommand for additional detail \tn 
% Row Count 14 (+ 8)
\hhline{>{\arrayrulecolor{DarkBackground}}---}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{5.7358 cm} x{5.5671 cm} x{5.5671 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{3}{x{17.67cm}}{\bf\textcolor{white}{Working with branches}}  \tn
% Row 0
\SetRowColor{LightBackground}
Create a branch on the SVN repo & `git svn branch \textless{}branch\_name\textgreater{} {[}-{}-parents{]}` & This has to be done if you want the branch to be committed to the SVN repo; the `-{}-parents` option forces the creation of parent directories if needed \tn 
% Row Count 12 (+ 12)
% Row 1
\SetRowColor{white}
Create a local git branch based on an existing SVN branch & `git checkout -b \textless{}local\_branch\textgreater{} \textless{}svn\_branch\textgreater{}` & This will keep both branches in sync \tn 
% Row Count 17 (+ 5)
\hhline{>{\arrayrulecolor{DarkBackground}}---}
\SetRowColor{LightBackground}
\mymulticolumn{3}{x{17.67cm}}{Be careful: if you rebase a branch on another, you might break something. \newline Make sure you run `git svn info` when you want to push modifications to an SVN branch to make sure you are committing to the appropriate branch: a broken SVN repo is hard to fix.}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}---}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{17.67cm}}{\bf\textcolor{white}{Useful resources}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{17.67cm}}{\seqsplit{https://viget.com/extend/effectively-using-git-with-subversion}} \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
\mymulticolumn{1}{x{17.67cm}}{\seqsplit{http://justaddwater.dk/2009/03/09/using-git-for-svn-repositories-workflow/}} \tn 
% Row Count 4 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}



\end{document}