Commit 3dab8437 authored by  Joe  Rackham's avatar Joe Rackham
Browse files

Initial commit

parents
\relax
\@writefile{toc}{\contentsline {section}{\numberline {1}Getting Started}{1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Creating a repo}{1}}
\@writefile{toc}{\contentsline {section}{\numberline {2}Managing Git}{1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {2.1}Configuring}{1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {2.2}Aliases}{1}}
\@writefile{toc}{\contentsline {section}{\numberline {3}Branching \& Merging}{1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {3.1}Creating a new branch}{1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {3.2}Fast-Forward Merging}{1}}
\@writefile{toc}{\contentsline {section}{\numberline {4}Workflow}{2}}
\@writefile{toc}{\contentsline {subsection}{\numberline {4.1}Committing}{2}}
\@writefile{toc}{\contentsline {subsection}{\numberline {4.2}Stashing}{2}}
\@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}}
This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2020.3.23) 23 MAR 2020 09:54
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
**main.tex
(./main.tex
LaTeX2e <2017-04-15>
Babel <3.18> and hyphenation patterns for 3 language(s) loaded.
(/usr/share/texlive/texmf-dist/tex/latex/base/article.cls
Document Class: article 2014/09/29 v1.4h Standard LaTeX document class
(/usr/share/texlive/texmf-dist/tex/latex/base/size10.clo
File: size10.clo 2014/09/29 v1.4h Standard LaTeX file (size option)
)
\c@part=\count79
\c@section=\count80
\c@subsection=\count81
\c@subsubsection=\count82
\c@paragraph=\count83
\c@subparagraph=\count84
\c@figure=\count85
\c@table=\count86
\abovecaptionskip=\skip41
\belowcaptionskip=\skip42
\bibindent=\dimen102
)
(/usr/share/texlive/texmf-dist/tex/latex/geometry/geometry.sty
Package: geometry 2010/09/12 v5.6 Page Geometry
(/usr/share/texlive/texmf-dist/tex/latex/graphics/keyval.sty
Package: keyval 2014/10/28 v1.15 key=value parser (DPC)
\KV@toks@=\toks14
)
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ifpdf.sty
Package: ifpdf 2017/03/15 v3.2 Provides the ifpdf switch
)
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ifvtex.sty
Package: ifvtex 2016/05/16 v1.6 Detect VTeX and its facilities (HO)
Package ifvtex Info: VTeX not detected.
)
(/usr/share/texlive/texmf-dist/tex/generic/ifxetex/ifxetex.sty
Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
)
\Gm@cnth=\count87
\Gm@cntv=\count88
\c@Gm@tempcnt=\count89
\Gm@bindingoffset=\dimen103
\Gm@wd@mp=\dimen104
\Gm@odd@mp=\dimen105
\Gm@even@mp=\dimen106
\Gm@layoutwidth=\dimen107
\Gm@layoutheight=\dimen108
\Gm@layouthoffset=\dimen109
\Gm@layoutvoffset=\dimen110
\Gm@dimlist=\toks15
)
(/usr/share/texlive/texmf-dist/tex/latex/float/float.sty
Package: float 2001/11/08 v1.3d Float enhancements (AL)
\c@float@type=\count90
\float@exts=\toks16
\float@box=\box26
\@float@everytoks=\toks17
\@floatcapt=\box27
)
(/usr/share/texlive/texmf-dist/tex/latex/graphics/rotating.sty
Package: rotating 2016/08/11 v2.16d rotated objects in LaTeX
(/usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty
Package: graphicx 2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR)
(/usr/share/texlive/texmf-dist/tex/latex/graphics/graphics.sty
Package: graphics 2017/06/25 v1.2c Standard LaTeX Graphics (DPC,SPQR)
(/usr/share/texlive/texmf-dist/tex/latex/graphics/trig.sty
Package: trig 2016/01/03 v1.10 sin cos tan (DPC)
)
(/usr/share/texlive/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
File: graphics.cfg 2016/06/04 v1.11 sample graphics configuration
)
Package graphics Info: Driver file: pdftex.def on input line 99.
(/usr/share/texlive/texmf-dist/tex/latex/graphics-def/pdftex.def
File: pdftex.def 2018/01/08 v1.0l Graphics/color driver for pdftex
))
\Gin@req@height=\dimen111
\Gin@req@width=\dimen112
)
(/usr/share/texlive/texmf-dist/tex/latex/base/ifthen.sty
Package: ifthen 2014/09/29 v1.1c Standard LaTeX ifthen package (DPC)
)
\c@r@tfl@t=\count91
\rotFPtop=\skip43
\rotFPbot=\skip44
\rot@float@box=\box28
\rot@mess@toks=\toks18
)
LaTeX Warning: Unused global option(s):
[8pt].
(./main.aux)
\openout1 = `main.aux'.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 10.
LaTeX Font Info: ... okay on input line 10.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 10.
LaTeX Font Info: ... okay on input line 10.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 10.
LaTeX Font Info: ... okay on input line 10.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 10.
LaTeX Font Info: ... okay on input line 10.
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 10.
LaTeX Font Info: ... okay on input line 10.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 10.
LaTeX Font Info: ... okay on input line 10.
*geometry* driver: auto-detecting
*geometry* detected driver: pdftex
*geometry* verbose mode - [ preamble ] result:
* driver: pdftex
* paper: <default>
* layout: <same size as paper>
* layoutoffset:(h,v)=(0.0pt,0.0pt)
* modes:
* h-part:(L,W,R)=(72.26999pt, 469.75502pt, 72.26999pt)
* v-part:(T,H,B)=(72.26999pt, 650.43001pt, 72.26999pt)
* \paperwidth=614.295pt
* \paperheight=794.96999pt
* \textwidth=469.75502pt
* \textheight=650.43001pt
* \oddsidemargin=0.0pt
* \evensidemargin=0.0pt
* \topmargin=-37.0pt
* \headheight=12.0pt
* \headsep=25.0pt
* \topskip=10.0pt
* \footskip=30.0pt
* \marginparwidth=65.0pt
* \marginparsep=11.0pt
* \columnsep=10.0pt
* \skip\footins=9.0pt plus 4.0pt minus 2.0pt
* \hoffset=0.0pt
* \voffset=0.0pt
* \mag=1000
* \@twocolumnfalse
* \@twosidefalse
* \@mparswitchfalse
* \@reversemarginfalse
* (1in=72.27pt=25.4mm, 1cm=28.453pt)
(/usr/share/texlive/texmf-dist/tex/context/base/mkii/supp-pdf.mkii
[Loading MPS to PDF converter (version 2006.09.02).]
\scratchcounter=\count92
\scratchdimen=\dimen113
\scratchbox=\box29
\nofMPsegments=\count93
\nofMParguments=\count94
\everyMPshowfont=\toks19
\MPscratchCnt=\count95
\MPscratchDim=\dimen114
\MPnumerator=\count96
\makeMPintoPDFobject=\count97
\everyMPtoPDFconversion=\toks20
) (/usr/share/texlive/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
Package: epstopdf-base 2016/05/15 v2.6 Base part for package epstopdf
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/infwarerr.sty
Package: infwarerr 2016/05/16 v1.4 Providing info/warning/error messages (HO)
)
(/usr/share/texlive/texmf-dist/tex/latex/oberdiek/grfext.sty
Package: grfext 2016/05/16 v1.2 Manage graphics extensions (HO)
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty
Package: kvdefinekeys 2016/05/16 v1.4 Define keys (HO)
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
Package: ltxcmds 2016/05/16 v1.23 LaTeX kernel commands for general use (HO)
)))
(/usr/share/texlive/texmf-dist/tex/latex/oberdiek/kvoptions.sty
Package: kvoptions 2016/05/16 v3.12 Key value format for package options (HO)
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
Package: kvsetkeys 2016/05/16 v1.17 Key value parser (HO)
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/etexcmds.sty
Package: etexcmds 2016/05/16 v1.6 Avoid name clashes with e-TeX commands (HO)
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ifluatex.sty
Package: ifluatex 2016/05/16 v1.4 Provides the ifluatex switch (HO)
Package ifluatex Info: LuaTeX not detected.
)
Package etexcmds Info: Could not find \expanded.
(etexcmds) That can mean that you are not using pdfTeX 1.50 or
(etexcmds) that some package has redefined \expanded.
(etexcmds) In the latter case, load this package earlier.
)))
(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
Package: pdftexcmds 2018/01/21 v0.26 Utility functions of pdfTeX for LuaTeX (HO
)
Package pdftexcmds Info: LuaTeX not detected.
Package pdftexcmds Info: \pdf@primitive is available.
Package pdftexcmds Info: \pdf@ifprimitive is available.
Package pdftexcmds Info: \pdfdraftmode found.
)
Package epstopdf-base Info: Redefining graphics rule for `.eps' on input line 4
38.
Package grfext Info: Graphics extension search list:
(grfext) [.pdf,.png,.jpg,.mps,.jpeg,.jbig2,.jb2,.PDF,.PNG,.JPG,.JPE
G,.JBIG2,.JB2,.eps]
(grfext) \AppendGraphicsExtensions on input line 456.
(/usr/share/texlive/texmf-dist/tex/latex/latexconfig/epstopdf-sys.cfg
File: epstopdf-sys.cfg 2010/07/13 v1.3 Configuration of (r)epstopdf for TeX Liv
e
))
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <12> on input line 11.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <8> on input line 11.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line 11.
LaTeX Font Info: Try loading font information for OMS+cmr on input line 17.
(/usr/share/texlive/texmf-dist/tex/latex/base/omscmr.fd
File: omscmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions
)
LaTeX Font Info: Font shape `OMS/cmr/m/n' in size <10> not available
(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 17.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <7> on input line 30.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line 30.
[1
{/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}] [2] (./main.aux) )
Here is how much of TeX's memory you used:
2104 strings out of 494923
30036 string characters out of 6180742
91561 words of memory out of 5000000
5406 multiletter control sequences out of 15000+600000
7755 words of font info for 28 fonts, out of 8000000 for 9000
14 hyphenation exceptions out of 8191
41i,6n,32p,271b,187s stack positions out of 5000i,500n,10000p,200000b,80000s
</usr/sh
are/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb></usr/share/te
xlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb></usr/share/texlive/t
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, 74865 bytes).
PDF statistics:
35 PDF objects out of 1000 (max. 8388607)
24 compressed objects within 1 object stream
0 named destinations out of 1000 (max. 500000)
1 words of extra memory for PDF output out of 10000 (max. 10000000)
File added
\documentclass[8pt]{article}
\usepackage[portrait, margin=1in]{geometry}
\usepackage{float}
\usepackage{rotating}
\title{Git Guide}
\author{Joe Rackham}
\date{}
\begin{document}
\maketitle
\section{Getting Started}
\subsection{Creating a repo}
\begin{itemize}
\item \texttt{git init *dir\_name*} creates a new directory suitable to work with git
\item \texttt{git init} converts an un-versioned directory into one usable with git
\end{itemize}
\section{Managing Git}
\subsection{Configuring}
\begin{itemize}
\item \texttt{git config} is used to set configuration variables on a global or local level
\item These variables are listed in \texttt{.gitconfig} text files.
\item \texttt{--local} and \texttt{--global} are used to specify the visibility level; local is default
\item \texttt{git config *var*} with report the var \texttt{git config *var* *value*} will update it
\end{itemize}
\begin{tabular}{|c|c|}
\hline
user.email & User's email address \\
\hline
core.editor & Editor to open if input is required \\
\hline
colour.ui & Used to adjust terminal output colouring \\
\hline
\end{tabular}
\subsection{Aliases}
\begin{itemize}
\item \texttt{git config alias.*abv* *cmd*} creates an alias for a command in the git config
\item Note that the alias can't include the \texttt{git} command
\end{itemize}
\section{Branching \& Merging}
\subsection{Creating a new branch}
\begin{itemize}
\item \texttt{git branch *bname*} creates a new branch
\item \texttt{git checkout *bname*} begins working on that branch
\item The first push has form \texttt{git push origin *orig\_branch*} to set the upstream for the branch
\end{itemize}
\subsection{Fast-Forward Merging}
Can ONLY be use when there is a linear path to the branch head from the parent head:
\begin{verbatim}
git checkout *parent_branch*
git merger *child_branch*
\end{verbatim}
\section{Workflow}
\subsection{Committing}
\begin{itemize}
\item \texttt{git resest} will reset the changes staged for a commit
\item The \texttt{--ammend} option will update the previous commit instead of creating a new one
\end{itemize}
\subsection{Stashing}
\begin{itemize}
\item \texttt{git stash} will store all changes made since the last commit for a later time
\item \texttt{git stash pop} will restore these changes and remove them from the stash
\item \texttt{git stash apply} will restore the changes and keep them in the stash
\item Stashing ignores un-tracked and ignored files
\item \texttt{git stash save *msg*} will stash changes with an annotation
\end{itemize}
\subsection{Tracking Changes}
\begin{itemize}
\item \texttt{git log} details recent changes to the repo
\item \texttt{git blame} identifies the author associated with a specific committed line
\end{itemize}
\subsection{Undoing Changes}
Checkout:
\begin{itemize}
\item \texttt{git checkout *hash*} sets the working state to that of a previous commit, the head pointer isn't moved
\item This puts us in a detached HEAD state where we aren't working on any branch
\item \texttt{git checkout -b *new\_bname*} will move any work we do to a new branch so it is not garbage collected
\end{itemize}
Revert:
\begin{itemize}
\item \texttt{git revert HEAD} will create a new commit with the inverse of the last commit
\end{itemize}
Reset:
\begin{itemize}
\item \texttt{git reset --hard} removes the previous commit from the history
\end{itemize}
\subsection{Maintenance}
\begin{itemize}
\item \texttt{git clean} will delete any un-tracked files; option \texttt{-n} can be used to do a `dry-run`
\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