\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{alasja (smoothtea)}
\pdfinfo{
  /Title (git-common-use.pdf)
  /Creator (Cheatography)
  /Author (alasja (smoothtea))
  /Subject (git common use 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}{2084E8}
\definecolor{LightBackground}{HTML}{F1F7FD}
\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 common use Cheat Sheet}}}} \\
    \normalsize{by \textcolor{DarkBackground}{alasja (smoothtea)} via \textcolor{DarkBackground}{\uline{cheatography.com/59059/cs/15524/}}}
\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}alasja (smoothtea) \\
  \uline{cheatography.com/smoothtea} \\
  \end{tabulary}
\vfill
\columnbreak
\begin{tabulary}{5.8cm}{L}
  \SetRowColor{FootBackground}
  \mymulticolumn{1}{p{5.377cm}}{\bf\textcolor{white}{Cheat Sheet}}  \\
   \vspace{-2pt}Published 19th April, 2018.\\
   Updated 19th 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{tabularx}{17.67cm}{p{2.2451 cm} x{15.0249 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{工程相关}}  \tn
% Row 0
\SetRowColor{LightBackground}
\seqsplit{代码} & git clone \seqsplit{ssh://git@gitlab.yygamedev.com:9022/liuqi/yworld.git} yworld \tn 
% Row Count 3 (+ 3)
% Row 1
\SetRowColor{white}
\seqsplit{资源} & git clone \seqsplit{ssh://git@gitlab.yygamedev.com:9022/liuqi/yres.git} config \tn 
% Row Count 5 (+ 2)
% Row 2
\SetRowColor{LightBackground}
\seqsplit{脚本} & git clone \seqsplit{ssh://git@gitlab.yygamedev.com:9022/liuqi/yscripts.git} scripts \tn 
% Row Count 8 (+ 3)
% Row 3
\SetRowColor{white}
\seqsplit{工具} & git clone \seqsplit{git@gitlab.yygamedev.com:9022/liuqi/tools.git} tools \tn 
% Row Count 10 (+ 2)
% Row 4
\SetRowColor{LightBackground}
\seqsplit{文档} & git clone \seqsplit{git@gitlab.yygamedev.com:9022/liuqi/documents.git} tools \tn 
% Row Count 12 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{17.67cm}}{工程git clone}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{3.1086 cm} x{14.1614 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{git 简写}}  \tn
% Row 0
\SetRowColor{LightBackground}
\seqsplit{checkout} & git config -{}-global alias.co checkout \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
branch & git config -{}-global alias.br branch \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
commit & git config -{}-global alias.ci commit \tn 
% Row Count 6 (+ 2)
% Row 3
\SetRowColor{white}
status & git config -{}-global alias.st status \tn 
% Row Count 8 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\SetRowColor{LightBackground}
\mymulticolumn{2}{x{17.67cm}}{简写设置}  \tn 
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{5.8718 cm} x{11.3982 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{git 提交流程}}  \tn
% Row 0
\SetRowColor{LightBackground}
1. \seqsplit{查看当前状态} & git st \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
2. \seqsplit{添加所有修改} & git add .   \{\{nl\}\}  \seqsplit{慎用，只要st列出的文件都会被添加} \tn 
% Row Count 5 (+ 3)
% Row 2
\SetRowColor{LightBackground}
2. \seqsplit{添加所有修改} & git add -u   \{\{nl\}\} \seqsplit{对比上面一条，不会添加任何} \{\{nl\}\}新增文件， 比较适合本地有 \{\{nl\}\}临时文件不需要提交的情况 \tn 
% Row Count 11 (+ 6)
% Row 3
\SetRowColor{white}
3. 提交修改 & git ci -m "modify desc" \tn 
% Row Count 13 (+ 2)
% Row 4
\SetRowColor{LightBackground}
4. 同步远端 & git pull \tn 
% Row Count 15 (+ 2)
% Row 5
\SetRowColor{white}
5. 推送远端 & git push \tn 
% Row Count 17 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{9.4985 cm} x{7.7715 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{log 查看}}  \tn
% Row 0
\SetRowColor{LightBackground}
当前分支log & git log \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
\seqsplit{查看指定人员的log} & git log \seqsplit{—-author=username} \tn 
% Row Count 3 (+ 2)
% Row 2
\SetRowColor{LightBackground}
\seqsplit{查看文件修改追踪} & git blame file \tn 
% Row Count 5 (+ 2)
% Row 3
\SetRowColor{white}
\seqsplit{查看某条log详细修改内容} & git show c1c5d692c0 \tn 
% Row Count 7 (+ 2)
% Row 4
\SetRowColor{LightBackground}
查看stash内容 & git show stash@\{n\} \tn 
% Row Count 8 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{8.1169 cm} x{9.1531 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{git 分支相关}}  \tn
% Row 0
\SetRowColor{LightBackground}
同步分支 & git fetch \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
切换分支 & git co feature/xxx \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
查看分支 & git br {[}-a{]} \tn 
% Row Count 3 (+ 1)
% Row 3
\SetRowColor{white}
\seqsplit{删除本地分支} & git br -d|D feature/xxx    \{\{nl\}\}(D表示强制删除) \tn 
% Row Count 6 (+ 3)
% Row 4
\SetRowColor{LightBackground}
\seqsplit{删除远端分支} & git push origin -{}-delete feature/xxx \tn 
% Row Count 8 (+ 2)
% Row 5
\SetRowColor{white}
\seqsplit{修改本地分支名称} & git branch -m devel develop \tn 
% Row Count 10 (+ 2)
% Row 6
\SetRowColor{LightBackground}
\seqsplit{以本地当前内容新建分支} & git co -b feature/xxx \tn 
% Row Count 12 (+ 2)
% Row 7
\SetRowColor{white}
\seqsplit{推送为新分支} & git push origin feature/xxx \tn 
% Row Count 14 (+ 2)
% Row 8
\SetRowColor{LightBackground}
\seqsplit{本地新建分支跟踪远端分支} & git branch -{}-set-upstream-to origin/feature/xxx \tn 
% Row Count 17 (+ 3)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{8.2896 cm} x{8.9804 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{解决冲突}}  \tn
% Row 0
\SetRowColor{LightBackground}
使用对方版本 & git co -{}-theirs \tn 
% Row Count 1 (+ 1)
% Row 1
\SetRowColor{white}
使用自己版本 & git co -{}-ours \tn 
% Row Count 2 (+ 1)
% Row 2
\SetRowColor{LightBackground}
\seqsplit{不能直接使用某方版本} & 手动修改后  git add -f file \tn 
% Row Count 4 (+ 2)
% Row 3
\SetRowColor{white}
最后提交 & git ci -m "merge" \tn 
% Row Count 5 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{5.3537 cm} x{11.9163 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{暂存}}  \tn
% Row 0
\SetRowColor{LightBackground}
\seqsplit{查看暂存列表} & git stash list \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
\seqsplit{当前修改暂存} & git stash save "stash name" \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
\seqsplit{应用暂存} & git stash apply stash@\{n\}   \{\{nl\}\}git stash list中会列出n的值 \tn 
% Row Count 7 (+ 3)
% Row 3
\SetRowColor{white}
\seqsplit{弹出暂存} & git stash pop stash@\{n\} \{\{nl\}\} 类似apply，同时会尝试删除stash\{\{nl\}\}若发生冲突则保留改stash \tn 
% Row Count 12 (+ 5)
% Row 4
\SetRowColor{LightBackground}
\seqsplit{删除暂存} & git stash drop stash@\{n\} \tn 
% Row Count 13 (+ 1)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}

\begin{tabularx}{17.67cm}{x{10.0166 cm} x{7.2534 cm} }
\SetRowColor{DarkBackground}
\mymulticolumn{2}{x{17.67cm}}{\bf\textcolor{white}{其他}}  \tn
% Row 0
\SetRowColor{LightBackground}
找回删除的内容 & git fsck -{}-lost-found \tn 
% Row Count 2 (+ 2)
% Row 1
\SetRowColor{white}
\seqsplit{清理远端已删除的分支} & git fetch -p \tn 
% Row Count 4 (+ 2)
% Row 2
\SetRowColor{LightBackground}
回滚本地提交 & git reset -{}-hard commit\_id \tn 
% Row Count 6 (+ 2)
% Row 3
\SetRowColor{white}
\seqsplit{回滚本地后，强制推送远端} & git push -f \tn 
% Row Count 8 (+ 2)
\hhline{>{\arrayrulecolor{DarkBackground}}--}
\end{tabularx}
\par\addvspace{1.3em}



\end{document}