\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{sasworkshops} \pdfinfo{ /Title (sas-workshops-git-cli-cheatsheet.pdf) /Creator (Cheatography) /Author (sasworkshops) /Subject (SAS Workshops Git CLI Cheatsheet 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}{5C73F2} \definecolor{LightBackground}{HTML}{F4F6FE} \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{SAS Workshops Git CLI Cheatsheet Cheat Sheet}}}} \\ \normalsize{by \textcolor{DarkBackground}{sasworkshops} via \textcolor{DarkBackground}{\uline{cheatography.com/123878/cs/23546/}}} \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}sasworkshops \\ \uline{cheatography.com/sasworkshops} \\ \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 1st July, 2020.\\ 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}{Watch Command}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{\#!/bin/bash \newline ARGS="\$\{@\}" \newline clear; \newline while(true); do \newline OUTPUT=`\$ARGS` \newline clear \newline echo -e "\$\{OUTPUT{[}@{]}\}" \newline sleep 2 \newline done} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{This mimics the native linux watch command which is not present in Git Bash. \newline \newline Add this content to a file named watch (no extension) in C:\textbackslash{}Program Files\textbackslash{}Git\textbackslash{}usr\textbackslash{}bin\textbackslash{} \newline \newline After that you can watch any cmd by typing `watch CMD\_TO\_WATCH`} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{x{1.23579 cm} x{1.64772 cm} x{1.69349 cm} } \SetRowColor{DarkBackground} \mymulticolumn{3}{x{5.377cm}}{\bf\textcolor{white}{Useful Aliases}} \tn % Row 0 \SetRowColor{LightBackground} {\bf{Command}} & {\bf{Alias Definition}} & {\bf{Result}} \tn % Row Count 2 (+ 2) % Row 1 \SetRowColor{white} \{\{nobreak\}\}`git new` & \{\{noshy\}\}`git config -{}-global alias.new '!git init \&\& git symbolic-ref HEAD \seqsplit{refs/heads/main'`} & creates new repo with main as default branch name instead of master \tn % Row Count 9 (+ 7) % Row 2 \SetRowColor{LightBackground} \{\{nobreak\}\}`git graph` & \{\{noshy\}\}`git config -{}-global alias.graph 'log -{}-graph -{}-abbrev-commit -{}-pretty=oneline -{}-decorate -{}-color=always'` & creates a nice commit graph \tn % Row Count 18 (+ 9) % Row 3 \SetRowColor{white} \{\{nobreak\}\}`git \seqsplit{watch-status`} & \{\{noshy\}\}`git config -{}-global \seqsplit{alias.watch-status} '! watch git -c \seqsplit{color.status=always} status'` & watches git status with colors \tn % Row Count 25 (+ 7) % Row 4 \SetRowColor{LightBackground} \{\{nobreak\}\}`git stashall` & \{\{noshy\}\}git config -{}-global \seqsplit{alias.stashall} 'stash save -{}-include-untracked' & stashes untracked files as well as tracked files \tn % Row Count 31 (+ 6) \end{tabularx} \par\addvspace{1.3em} \vfill \columnbreak \begin{tabularx}{5.377cm}{x{1.23579 cm} x{1.64772 cm} x{1.69349 cm} } \SetRowColor{DarkBackground} \mymulticolumn{3}{x{5.377cm}}{\bf\textcolor{white}{Useful Aliases (cont)}} \tn % Row 5 \SetRowColor{LightBackground} \{\{nobreak\}\}`git cloneall` & \{\{noshy\}\}git config -{}-global \seqsplit{alias.cloneall} 'clone -{}-recurse-submodules -{}-no-hardlinks' & Recurses submodules (and adds no hard-links) \tn % Row Count 7 (+ 7) \hhline{>{\arrayrulecolor{DarkBackground}}---} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{X} \SetRowColor{DarkBackground} \mymulticolumn{1}{x{5.377cm}}{\bf\textcolor{white}{Keeping a Fork Up To Date}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{\#add remote if not already added \newline git remote add upstream URL\_TO\_UPSTREAM \newline \#fetch remote branches \newline git fetch upstream \newline \#For each branch: \newline \#merge changes \newline git merge upstream/MYBRANCH \newline \#or rebase \newline git rebase upstream/MYBRANCH \newline \#push changes to fork (origin) \newline git push origin MYBRANCH} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{Use these commands to keep a fork up to date with an upstream repository.} \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}{Setting up LVCompare and LVMerge}} \tn \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{\#Setup LVCompare \newline git config -{}-global diff.tool LVCompare \newline git config -{}-global difftool.LVCompare.cmd 'C:\textbackslash{}\textbackslash{}viscc\textbackslash{}\textbackslash{}vidiff.exe "\$LOCAL" "\$REMOTE" -nobdcosm -nobdpos' \newline \$Setup LVMerge \newline git config -{}-global merge.tool LVMerge \newline git config -{}-global mergetool.LVMerge.cmd 'C:\textbackslash{}\textbackslash{}viscc\textbackslash{}\textbackslash{}vimerge.exe "\$BASE" "\$REMOTE" "\$LOCAL" "\$MERGED" -nobdcosm -nobdpos' \newline \#Call LVCompare \newline git difftool \newline \#Call LVMerge \newline git mergetool} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \SetRowColor{LightBackground} \mymulticolumn{1}{x{5.377cm}}{First clone the repo at \{\{link="https://github.com/smithed/vicompare"\}\}https://github.com/smithed/vicompare\{\{/link\}\}. \newline \newline Build all 4 build specs in order and then run the installer.} \tn \hhline{>{\arrayrulecolor{DarkBackground}}-} \end{tabularx} \par\addvspace{1.3em} \begin{tabularx}{5.377cm}{p{0.4977 cm} p{0.4977 cm} } \SetRowColor{DarkBackground} \mymulticolumn{2}{x{5.377cm}}{\bf\textcolor{white}{Push to new gitlab from CLI}} \tn % Row 0 \SetRowColor{LightBackground} \mymulticolumn{2}{x{5.377cm}}{} \tn % Row Count 0 (+ 0) \hhline{>{\arrayrulecolor{DarkBackground}}--} \end{tabularx} \par\addvspace{1.3em} % That's all folks \end{multicols*} \end{document}