\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{{[}deleted{]}}
\pdfinfo{
  /Title (git-basics-commands.pdf)
  /Creator (Cheatography)
  /Author ({[}deleted{]})
  /Subject (Git basics commands 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}{1C0663}
\definecolor{LightBackground}{HTML}{F7F7FA}
\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 basics commands Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{{[}deleted{]}} via \textcolor{DarkBackground}{\uline{cheatography.com/26084/cs/7195/}}}
\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}{[}deleted{]} \\
  \uline{cheatography.com/deleted-26084} \\
  \end{tabulary}
\vfill
\columnbreak
\begin{tabulary}{5.8cm}{L}
  \SetRowColor{FootBackground}
  \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}}  \\
   \vspace{-2pt}Published 14th February, 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{multicols*}{2}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Workflow}}  \tn
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{La règle d'or est de ne jamais travailler sur master et toujours la garder fonctionnelle. \newline % Row Count 2 (+ 2)
Implémentation d'une nouvelle feature: \newline % Row Count 3 (+ 1)
{\bf{1) Créer une nouvelle branche}} \newline % Row Count 4 (+ 1)
\$ git checkout -b \textless{}branchName\textgreater{} \newline % Row Count 5 (+ 1)
{\bf{2) Une fois le travail terminé}} \newline % Row Count 6 (+ 1)
\$ git add \textless{}file(s)\textgreater{} \&\& git commit -m 'message explicite' \newline % Row Count 8 (+ 2)
{\bf{3) Récupérer les changements sur master depuis le début de ma feature}} \newline % Row Count 10 (+ 2)
\$ git checkout master \&\& git pull \newline % Row Count 11 (+ 1)
{\bf{4) Ajouter les changements à ma branche}} \newline % Row Count 12 (+ 1)
\$ git checkout \textless{}branchName\textgreater{} \&\& git rebase -i master \newline % Row Count 14 (+ 2)
Profitez de cette étape pour mettre un clean dans les commit et ne faire qu'un seul commit structuré. (option 'squash' dans l'editeur qui rebase) \newline % Row Count 17 (+ 3)
{\bf{5) TESTER QUE TOUT FONCTIONNE}} \newline % Row Count 18 (+ 1)
{\bf{6) RETESTER QUE TOUT FONCTIONNE}} \newline % Row Count 19 (+ 1)
{\bf{7) Repasser sur master, vérifier qu'aucun changement n'a été effectué durant les tests}} \newline % Row Count 21 (+ 2)
\$ git checkout master \&\& git pull \newline % Row Count 22 (+ 1)
Si il y a eu des changements répéter les étapes 4, 5, 6 et 7 sinon continuer a l'étape suivante \newline % Row Count 24 (+ 2)
{\bf{8) Ajouter ma feature sur master}} \newline % Row Count 25 (+ 1)
\$ git merge \textless{}branchName\textgreater{} \newline % Row Count 26 (+ 1)
Les changements sont maintenant sur master. \newline % Row Count 27 (+ 1)
{\bf{9) Détruire la branche en local et sur le serveur }} \newline % Row Count 29 (+ 2)
\$ git branch -D \textless{}branchName\textgreater{} \&\& git push origin :\textless{}branchName\textgreater{}% Row Count 31 (+ 2)
} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Merge / Rebase}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Fusionne \textless{}branch\textgreater{} avec la branche courante} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git merge \textless{}branch\textgreater{}} \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Rebase la branche courante avec \textless{}branch\textgreater{}} \tn 
% Row Count 3 (+ 1)
% Row 3
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git rebase \textless{}branch\textgreater{}} \tn 
% Row Count 4 (+ 1)
% Row 4
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Rebase en mode interactif} \tn 
% Row Count 5 (+ 1)
% Row 5
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git rebase -i \textless{}branch\textgreater{}} \tn 
% Row Count 6 (+ 1)
% Row 6
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Annuler un rebase en cours} \tn 
% Row Count 7 (+ 1)
% Row 7
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git rebase -{}-abort} \tn 
% Row Count 8 (+ 1)
% Row 8
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Ajoute les fichiers pour continuer le rebase (après avoir réglé les conflits)} \tn 
% Row Count 10 (+ 2)
% Row 9
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git add \textless{}file\textgreater{}} \tn 
% Row Count 11 (+ 1)
% Row 10
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Valider le rebase après avoir résolu les confits et add les fichiers} \tn 
% Row Count 13 (+ 2)
% Row 11
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git rebase -{}-continue} \tn 
% Row Count 14 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Tools}}  \tn
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{{\bf{Atom avec les plugins:}} \newline % Row Count 1 (+ 1)
Merge conflict \newline % Row Count 2 (+ 1)
git control \newline % Row Count 3 (+ 1)
git log \newline % Row Count 4 (+ 1)
{\bf{shell}} \newline % Row Count 5 (+ 1)
http://ohmyz.sh/ \newline % Row Count 6 (+ 1)
{\bf{client graphique git}} \newline % Row Count 7 (+ 1)
sourcetree (mac) \newline % Row Count 8 (+ 1)
gitk (linux)% Row Count 9 (+ 1)
} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Save time}}  \tn
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{git config -{}-global editor.\textless{}editorName\textgreater{} \newline  \newline git config -{}-global alias.co checkout \newline git config -{}-global alias.ci commit \newline git config -{}-global alias.st status \newline git config -{}-global alias.lg "log -{}-oneline -{}-decorate -{}-graph -{}-all" \newline git config -{}-global alias.unstage "reset HEAD -{}-" \newline git config -{}-global alias.uncommit "reset -{}-soft HEAD\textasciicircum{}" \newline  \newline Ajouter un .gitignore a la racine de votre dépôt et ajouter les classiques \newline {\emph{.o \newline }}\textasciitilde{} \newline *.txt \newline le nom du binaire et ce que ne voulez pas rendre en général.} \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Divers}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Statut des fichiers dans le dossier courant} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git status} \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Afficher l'historique des commits} \tn 
% Row Count 3 (+ 1)
% Row 3
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git log} \tn 
% Row Count 4 (+ 1)
% Row 4
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Afficher les différences depuis le précédent commit} \tn 
% Row Count 6 (+ 2)
% Row 5
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git diff  ou git diff \textless{}name\textgreater{} pour spécifier un fichier} \tn 
% Row Count 8 (+ 2)
% Row 6
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Se déplacer sur un commit en particulier} \tn 
% Row Count 9 (+ 1)
% Row 7
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git checkout \textless{}SHA\_1\textgreater{}} \tn 
% Row Count 10 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Branch}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Créer une branche} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git branch \textless{}branch\_name\textgreater{}} \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Effacer une branche en local} \tn 
% Row Count 3 (+ 1)
% Row 3
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git branch -D \textless{}branch\_name\textgreater{}} \tn 
% Row Count 4 (+ 1)
% Row 4
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Effacer une branche sur le serveur} \tn 
% Row Count 5 (+ 1)
% Row 5
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git  push origin :\textless{}branch\_name\textgreater{}} \tn 
% Row Count 6 (+ 1)
% Row 6
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Afficher la liste des branches} \tn 
% Row Count 7 (+ 1)
% Row 7
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git branch} \tn 
% Row Count 8 (+ 1)
% Row 8
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Changer de branche} \tn 
% Row Count 9 (+ 1)
% Row 9
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git checkout \textless{}branch\_name\textgreater{}} \tn 
% Row Count 10 (+ 1)
% Row 10
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Créer et changer de branche} \tn 
% Row Count 11 (+ 1)
% Row 11
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git checkout -b \textless{}branch\_name\textgreater{}} \tn 
% Row Count 12 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{8.4cm}{X}
\SetRowColor{DarkBackground}
\mymulticolumn{1}{x{8.4cm}}{\bf\textcolor{white}{Panic button}}  \tn
% Row 0
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Enlever un fichier indexé} \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git reset HEAD \textless{}fileName\textgreater{}} \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Déplacer la HEAD sur le commit précédent} \tn 
% Row Count 3 (+ 1)
% Row 3
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git reset -{}-soft HEAD\textasciicircum{}} \tn 
% Row Count 4 (+ 1)
% Row 4
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Editer le précédent commit} \tn 
% Row Count 5 (+ 1)
% Row 5
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git commit -{}-amend} \tn 
% Row Count 6 (+ 1)
% Row 6
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Annuler tous les changement sur un fichier depuis le précédent commit} \tn 
% Row Count 8 (+ 2)
% Row 7
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git checkout -{}- \textless{}fileName\textgreater{}} \tn 
% Row Count 9 (+ 1)
% Row 8
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Restaurer l'état du dossier et faire une copie temporaire des changement en cours} \tn 
% Row Count 11 (+ 2)
% Row 9
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git stash} \tn 
% Row Count 12 (+ 1)
% Row 10
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Afficher la liste des sauvergardes temporaires} \tn 
% Row Count 13 (+ 1)
% Row 11
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git stash list} \tn 
% Row Count 14 (+ 1)
% Row 12
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Récupérer une sauvegarde temporaire} \tn 
% Row Count 15 (+ 1)
% Row 13
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git stash drop / git stash drop stash@\{2\}} \tn 
% Row Count 16 (+ 1)
% Row 14
\SetRowColor{LightBackground}
\mymulticolumn{1}{x{8.4cm}}{Supprimer la liste des sauvegardes temporaires} \tn 
% Row Count 17 (+ 1)
% Row 15
\SetRowColor{white}
\mymulticolumn{1}{x{8.4cm}}{\$ git stash clear} \tn 
% Row Count 18 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}-}
\end{tabularx}
\par\addvspace{1.3em}


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

\end{document}