\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{kimpel70}
\pdfinfo{
  /Title (hg.pdf)
  /Creator (Cheatography)
  /Author (kimpel70)
  /Subject (HG 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}{EDA539}
\definecolor{LightBackground}{HTML}{FDF9F2}
\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{HG Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{kimpel70} via \textcolor{DarkBackground}{\uline{cheatography.com/4828/cs/3380/}}}
\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}kimpel70 \\
  \uline{cheatography.com/kimpel70} \\
  \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 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}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Rebase statt Merge}}  \tn
\SetRowColor{white}
\mymulticolumn{1}{x{5.377cm}}{{\bf{Push geht nicht, weil auf dem Server Änderungen liegen ?}} \newline % Row Count 2 (+ 2)
Warum nicht mergen  \newline % Row Count 3 (+ 1)
{\bf{nicht mergen!!!}} \newline % Row Count 4 (+ 1)
Anstatt nun ein Merge zu erzeugen, was keinerlei Information bringt, werden die lokalen Änderung einfach per Rebase hinter die gepullten changesets verschoben, es bleibt bei einer Linie im Graph. \newline % Row Count 8 (+ 4)
Und so wird es gemacht: \newline % Row Count 9 (+ 1)
1. Die Änderungen vom Server werden gepullt \newline % Row Count 10 (+ 1)
2. Update auf den gepullten Stand \newline % Row Count 11 (+ 1)
3. Nun den unteresten {\emph{draft}}-Knoten rechtsklicken und w{\"a}hle rebase aus. \newline % Row Count 13 (+ 2)
Wichtige Einstellungen: \newline % Row Count 14 (+ 1)
* keep original Changesets \newline % Row Count 15 (+ 1)
* keep branch names \newline % Row Count 16 (+ 1)
4. Ist das Rebase erfolgreich (Es kann zu Konflikten kommen) müssen die originalen Changeset per Modify History/Strip entfernt werden.% Row Count 19 (+ 3)
} \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}{Feature Branch}}  \tn
\SetRowColor{white}
\mymulticolumn{1}{x{5.377cm}}{Eine neue Funktion/Programmteil soll entwickelt werden. Um die Beeinflussung des restlichen Projekts zu vermeiden, wird die Entwicklung in einen benannten separaten Branch durchgeführt. \newline % Row Count 4 (+ 4)
Das hat zus{\"a}tzlich den Vorteil, dass dokumentiert ist, welche Änderungen notwendig waren, um ein bestimmtes Feature zu entwickeln. \newline % Row Count 7 (+ 3)
{\bf{Projekte mit Hauptrepository}} \newline % Row Count 8 (+ 1)
In diesem Fall mu{\ss} der Branch im Hauptrepository ebenfalls angelegt werden und in weiteren Subrepositories die Änderungen enthalten, um diese Änderungen bündeln zu k{\"o}nnen.% Row Count 12 (+ 4)
} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}


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

\end{document}