\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-navod.pdf) /Creator (Cheatography) /Author ({[}deleted{]}) /Subject (Git návod 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}{156DB0} \definecolor{LightBackground}{HTML}{F0F5FA} \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 návod Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{{[}deleted{]}} via \textcolor{DarkBackground}{\uline{cheatography.com/56256/cs/14916/}}} \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-56256} \\ \end{tabulary} \vfill \columnbreak \begin{tabulary}{5.8cm}{L} \SetRowColor{FootBackground} \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}} \\ \vspace{-2pt}Published 28th February, 2018.\\ Updated 10th April, 2018.\\ 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{4 cm} x{4 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Nastavení}} \tn % Row 0 \SetRowColor{LightBackground} git ini & Inicializace repozitáře v existujícím adresáři \tn % Row Count 3 (+ 3) % Row 1 \SetRowColor{white} git remote add origin {[}url.git{]} & Připojení složky k repozitáři \tn % Row Count 5 (+ 2) % Row 2 \SetRowColor{LightBackground} git clone {[}url{]} & Stáhne všechna data z repozitáře \tn % Row Count 7 (+ 2) % Row 3 \SetRowColor{white} git config -{}-global user.name "John Doe" & Nastavení totožnosti - jméno \tn % Row Count 9 (+ 2) % Row 4 \SetRowColor{LightBackground} git config -{}-global user.email \seqsplit{johndoe(at)example.com} & Nastavení totožnosti - email \tn % Row Count 12 (+ 3) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.04 cm} x{4.96 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Základní příkazy}} \tn % Row 0 \SetRowColor{LightBackground} git pull & Aktualizuje lokální verzi s tou ze serveru \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git status & Zobrazí změny \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} git add . & Přidání souborů do staging area \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} git rm & Odstranění souboru \tn % Row Count 6 (+ 1) % Row 4 \SetRowColor{LightBackground} git commit -m"Komentář" & Vytvoření commitu \tn % Row Count 8 (+ 2) % Row 5 \SetRowColor{white} git push & Zaslání commitů na serverový repozitář \tn % Row Count 10 (+ 2) % Row 6 \SetRowColor{LightBackground} git push -{}-all origin & Pushne všechno i branche \tn % Row Count 12 (+ 2) % Row 7 \SetRowColor{white} git reset {[}soubor{]} & Odstraní soubory ze stage připravené pro commit \tn % Row Count 15 (+ 3) % Row 8 \SetRowColor{LightBackground} git checkout {[}soubor{]} & Odstranění změněných souborů, které nejsou v stage \tn % Row Count 18 (+ 3) % Row 9 \SetRowColor{white} git checkout {[}commit{]} & Přepnutí do commitu \tn % Row Count 20 (+ 2) % Row 10 \SetRowColor{LightBackground} git revert {[}commit{]} & Vrátí změny provedené commitem \tn % Row Count 22 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{4.48 cm} x{3.52 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Ostatní}} \tn % Row 0 \SetRowColor{LightBackground} git diff -{}-stat Hotfix & Zobrazení rozdílu větví \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git difftool & zobrazení změn v GUI \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git log -{}-graph -{}-oneline -{}-branches & Grafické zobrazení větví \tn % Row Count 6 (+ 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}{Code}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{git log -{}-graph -{}-abbrev-commit -{}-decorate -{}-format=format:'\%C(bold blue)\%h\%C(reset) - \%C(bold green)(\%ar)\%C(reset) \%C(white)\%s\%C(reset) \%C(dim white)- \seqsplit{\%an\%C(reset)\%C(auto)\%d\%C(reset)'} -{}-all} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{Zobrazení commitů ve všech větví} \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}{Diff/merge tool}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{{[}diff{]} \newline tool = diffmerge \newline {[}difftool "diffmerge"{]} \newline cmd = \seqsplit{E:/DiffMerge\_4\_2\_0\_697\_stable\_x64/sgdm}.exe \textbackslash{}"\$LOCAL\textbackslash{}" \textbackslash{}"\$REMOTE\textbackslash{}" \newline \newline {[}merge{]} \newline tool = diffmerge \newline {[}mergetool "diffmerge"{]} \newline trustExitCode = true \newline cmd = \seqsplit{E:/DiffMerge\_4\_2\_0\_697\_stable\_x64/sgdm}.exe -merge -result=\textbackslash{}"\$MERGED\textbackslash{}" \textbackslash{}"\$LOCAL\textbackslash{}" \textbackslash{}"\$BASE\textbackslash{}" \textbackslash{}"\$REMOTE\textbackslash{}"} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{8.4cm}}{C:\textbackslash{}Users\textbackslash{}{[}USER{]}\textbackslash{}.gitconfig} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.2 cm} x{4.8 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Větve}} \tn % Row 0 \SetRowColor{LightBackground} git branch experimentalni & Vytvoření větve \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git branch & Výpis větví \tn % Row Count 3 (+ 1) % Row 2 \SetRowColor{LightBackground} git branch -r & Výpis větví ve vzdáleném repozitáři \tn % Row Count 5 (+ 2) % Row 3 \SetRowColor{white} git checkout experimentalni & Přepnutí do větve \tn % Row Count 7 (+ 2) % Row 4 \SetRowColor{LightBackground} git merge hotfix & Sloučíme větev "hotfix" do větve ve které aktuálně jsme \tn % Row Count 10 (+ 3) % Row 5 \SetRowColor{white} git branch -d hotfix & Odstranění větve \tn % Row Count 12 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{3.12 cm} x{4.88 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Stash}} \tn % Row 0 \SetRowColor{LightBackground} git stash & Vytvoření shashe se všemi změnami \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git stash save "message" & -||- jen s vlastní zprávou \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git stash list & Výpis všeho \tn % Row Count 5 (+ 1) % Row 3 \SetRowColor{white} git stash show & Zobrazí detail shashe \tn % Row Count 6 (+ 1) % Row 4 \SetRowColor{LightBackground} git stash apply & Vráti změny a nechá je ve stashi \tn % Row Count 8 (+ 2) % Row 5 \SetRowColor{white} git stash pop & Vrátí změny a vymaže je ze shashe \tn % Row Count 10 (+ 2) % Row 6 \SetRowColor{LightBackground} git stash drop \textless{}stash\textgreater{} & Vymaže stash \tn % Row Count 12 (+ 2) % Row 7 \SetRowColor{white} git stash clear & Odstraní všechny stashe \tn % Row Count 14 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \SetRowColor{LightBackground} \mymulticolumn{2}{x{8.4cm}}{Odložení změn bokem(do shash). Změny ve stashi se nepočítají do změn. Např. při rychlém fixu si změněné soubory uložím do shashe} \tn \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{8.4cm}{x{4.72 cm} x{3.28 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{8.4cm}}{\bf\textcolor{white}{Konflikt}} \tn % Row 0 \SetRowColor{LightBackground} git checkout functions.java -{}-ours & Můj soubor \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} git checkout functions.java -{}-theirs & Jeho soubor \tn % Row Count 4 (+ 2) % Row 2 \SetRowColor{LightBackground} git mergetool & Řešení konfliktu v GUI \tn % Row Count 6 (+ 2) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}