Commit 705d327c authored by  Joe  Rackham's avatar Joe Rackham
Browse files

Squash pt 1 & 2

Squash pt 1

Squash pt 2
parent bc9622c0
......@@ -13,3 +13,4 @@
\@writefile{toc}{\contentsline {subsection}{\numberline {4.3}Tracking Changes}{2}}
\@writefile{toc}{\contentsline {subsection}{\numberline {4.4}Undoing Changes}{2}}
\@writefile{toc}{\contentsline {subsection}{\numberline {4.5}Maintenance}{2}}
\@writefile{toc}{\contentsline {subsection}{\numberline {4.6}Rewriting History}{2}}
This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2020.3.23) 23 MAR 2020 10:02
This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2020.3.23) 23 MAR 2020 10:26
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
......@@ -247,7 +247,7 @@ exmf-dist/fonts/type1/public/amsfonts/cm/cmr12.pfb></usr/share/texlive/texmf-di
st/fonts/type1/public/amsfonts/cm/cmr17.pfb></usr/share/texlive/texmf-dist/font
s/type1/public/amsfonts/cm/cmsy10.pfb></usr/share/texlive/texmf-dist/fonts/type
1/public/amsfonts/cm/cmtt10.pfb>
Output written on main.pdf (2 pages, 74911 bytes).
Output written on main.pdf (2 pages, 76356 bytes).
PDF statistics:
35 PDF objects out of 1000 (max. 8388607)
24 compressed objects within 1 object stream
......
No preview for this file type
No preview for this file type
......@@ -103,7 +103,14 @@ Reset:
\begin{itemize}
\item \texttt{git clean} will delete any un-tracked files; option \texttt{-n} can be used to do a `dry-run`
\item \texttt{git rm} removes a file from the working directory and the git index
end{itemize}
\end{itemize}
\subsection{Rewriting History}
\begin{itemize}
\item \texttt{git rebase} facilitates changing multiple or older commits
\item Public commits should never be rebased
\item \texttt{git squash} uses rebasing to combine multiple commits into one for a clean history
\end{itemize}
\end{document}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment