Commit efa87d5c authored by Mihai's avatar Mihai

Moved common parts to shared and started basics update

parent a9fc77c5
......@@ -2,13 +2,13 @@
\input{../shared/shared.tex}
\author{Jeroen F.J. Laros}
\author{}
\title{\courseTitle}
\providecommand{\mySubTitle}{Git Basics}
\providecommand{\myConference}{\courseTitle}
\providecommand{\myGroup}{}
\providecommand{\myDepartment}{Department of Human Genetics}
\providecommand{\myCenter}{Center for Human and Clinical Genetics}
\providecommand{\myCenter}{}
\usetheme{lumc}
......@@ -18,62 +18,97 @@
%\renewcommand{\pause}{}
% Make the title slide.
\makeTitleSlide{\includegraphics[width=3.5cm]{git_logo}}
\makeTitleSlide{\includegraphics[width=3.5cm]{../shared/git_logo.pdf}}
% First page of the presentation.
\section{Initialisation}
\subsection{Starting a project}
\section{Starting a project}
\subsection{You can either}
\begin{pframe}
Creating a new repository is easy. You do not need a server, no registration,
etc.
\begin{lstlisting}[language=none, caption=Make a new repository.]
$ cd ~/projects
$ git init
Initialized empty Git repository in <path>/.git/
\end{lstlisting}
1. Start from scratch on your own:
\vspace{-0.3cm}
\begin{framed}
\prompt\ \cmd{mkdir}\ \cmdarg{my\_project}\\
\prompt\ \cmd{cd}\ \cmdarg{my\_project}\\
\prompt\ \gitcmd\ \cmd{init}\\
\cliout{Initialized empty Git repository in \{current-directory\}\/.git\/}
\end{framed}
\pause
Or you can ``clone'' an existing repository.
\begin{lstlisting}[language=none, caption=Clone an existing repository.]
$ git clone <path-to-repository>
\end{lstlisting}
2. Or you can \cmd{clone} an existing remote (or local) repository:
\vspace{-0.3cm}
\begin{framed}
\prompt\ \gitcmd\ \cmd{clone}\ \cmdarg{\<path-to-repository\>}\\
\cliout{Cloning into \{repo-name\} ...}
\end{framed}
\end{pframe}
\subsection{Where does git store its repository information?}
\begin{pframe}
You can see a hidden directory in a Git repository.
\begin{lstlisting}[language=none, caption=A hidden directory is added.]
$ ls -a
. .. .git
\end{lstlisting}
\vspace{-0.3cm}
\begin{framed}
\prompt\ \cmd{ls}\ \cmdopt{-a}\\
\cliout{. .. .git}
\end{framed}
This is where git stores the files necessary to track your progress. You
rarely need to edit the contents of this directory.
\bigskip
This directory contains almost everything that Git stores and manipulates.
\important{Removing this directory means removing your repository!}
\end{pframe}
\section{Manipulation}
\subsection{Local operations}
\section{Git Operations}
\begin{pframe}
\begin{figure}[]
\begin{center}
\includegraphics[height=0.7\textheight]{18333fig0106-tn}
\end{center}
\caption{Working directory, staging area, and Git directory.}
\end{figure}
\vspace{-0.9cm}
Operations can be local or remote.\\
Most importantly, they track files around these three areas
\footnote[1]{\scriptsize{Adapted from
\href{http://git-scm.com/book/en/v2/Getting-Started-Git-Basics}
{Pro Git Book}.}}:
\begin{center}
\includegraphics[width=0.7\textwidth]{images/git_areas.pdf}\\
\end{center}
\end{pframe}
\subsection{Checking the status of your files}
\subsection{Prelude: quick setup}
\begin{pframe}
\begin{lstlisting}[language=none, caption=Check status.]
$ git status
nothing to commit (working directory clean)
\end{lstlisting}
If you have never used \gitcmd\ before you need to tell it who you are. This
information is saved in \cmdarg{.gitconfig}\ and used to mark each commit.
\vspace{-0.4cm}
\begin{framed}
\prompt\ \gitcmd\ \cmd{config}\ \cmdopt{--global user.name}\
\cmdarg{\{your-name-or-nick-name\}}\\
\prompt\ \gitcmd\ \cmd{config}\ \cmdopt{--global user.email}\
\cmdarg{\{your-email-address\}}
\end{framed}
\pause
\vspace{-0.2cm}
Local configuration for each repository is possible as well.
\vspace{-0.4cm}
\begin{framed}
\prompt\ \gitcmd\ \cmd{config}\ \cmdopt{--local user.name}\
\cmdarg{\{your-name-or-nick-name\}}\\
\prompt\ \gitcmd\ \cmd{config}\ \cmdopt{--local user.email}\
\cmdarg{\{your-email-address\}}
\end{framed}
\vspace{-0.2cm}
\pause
``\lstinline{git status}'' can tell you whether your files are:
\begin{itemize}
\item Untracked.
\item Unmodified.
\item Modified.
\item Staged.
\end{itemize}
You would like colored output?
\vspace{-0.4cm}
\begin{framed}
\prompt\ \gitcmd\ \cmd{config}\ \cmdopt{--global color.ui}\ \cmdarg{auto}
\end{framed}
\end{pframe}
\subsection{Checking the status of your files}
\begin{pframe}
\begin{framed}
\prompt\ \gitcmd\ \cmd{status}\\
\cliout{nothing to commit (working directory clean)}
\end{framed}
\end{pframe}
\begin{pframe}
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="124.88004mm"
height="90.946114mm"
viewBox="0 0 442.48831 322.25"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="git_areas.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="251.776"
inkscape:cy="148.34554"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1136"
inkscape:window-x="1280"
inkscape:window-y="27"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-126.89285,-121.39792)">
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4145"
d="m 129.14285,123.64792 120.07487,0 0,62.14286 -120.07487,0 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4274"
d="m 129.14285,443.64792 120.07487,0 0,-257.85714 -120.07487,0 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#fcf1f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#dd4c4c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 127.14285,121.64792 120.07487,0 0,62.14286 -120.07487,0 z"
id="rect4136"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="186.66759"
y="147.48253"
id="text4138"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4140"
x="186.66759"
y="147.48253"
style="font-size:15px;fill:#ffffff">Working</tspan><tspan
sodipodi:role="line"
x="186.66759"
y="166.23253"
id="tspan4142"
style="font-size:15px;fill:#ffffff">Directory</tspan></text>
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 289.14285,123.64792 120.07487,0 0,62.14286 -120.07487,0 z"
id="path4147"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e7f8ef;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 289.14285,443.64792 120.07487,0 0,-257.85714 -120.07487,0 z"
id="path4276"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4149"
d="m 287.14285,121.64792 120.07487,0 0,62.14286 -120.07487,0 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2e8b57;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<text
sodipodi:linespacing="125%"
id="text4151"
y="147.48253"
x="347.36707"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:15px;fill:#ffffff"
id="tspan4155"
y="147.48253"
x="347.36707"
sodipodi:role="line">Staging</tspan><tspan
style="font-size:15px;fill:#ffffff"
y="166.23253"
x="347.36707"
sodipodi:role="line"
id="tspan4159">Area</tspan></text>
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4161"
d="m 449.14285,123.64792 120.07487,0 0,62.14286 -120.07487,0 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4278"
d="m 449.14285,443.64792 120.07487,0 0,-257.85714 -120.07487,0 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#fafafa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f5f5f5;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 447.14285,121.64792 120.07487,0 0,62.14286 -120.07487,0 z"
id="path4163"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="506.60168"
y="147.48253"
id="text4165"
sodipodi:linespacing="125%"><tspan
id="tspan4169"
sodipodi:role="line"
x="506.60168"
y="147.48253"
style="font-size:15px;fill:#696969">.git directory</tspan><tspan
sodipodi:role="line"
x="506.60168"
y="166.23253"
style="font-size:15px;fill:#696969"
id="tspan4173">(repository)</tspan></text>
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 126.97938,183.04078 120.40179,0"
id="path4175"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path4200"
d="m 187.18027,183.04293 0,220.40179"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path4202"
d="m 286.97938,183.04078 120.40179,0"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 347.18027,183.04293 0,220.40179"
id="path4204"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 446.97938,183.04078 120.40179,0"
id="path4206"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path4208"
d="m 507.18027,183.04293 0,220.40179"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 240.64258,321.95117 -53.29102,30.76758 53.29102,30.76953 0,-19.69726 266.57422,0 0,-22.14258 -266.57422,0 z"
id="path4210"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="373.28571"
y="356.71506"
id="text4217"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4219"
x="373.28571"
y="356.71506"
style="font-size:15px;fill:#ffffff">Checkout</tspan></text>
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path4221"
d="m 293.92578,201.95117 53.29102,30.76758 -53.29102,30.76953 0,-19.69726 -106.57422,0 0,-22.14258 106.57422,0 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<text
sodipodi:linespacing="125%"
id="text4223"
y="237.09015"
x="238.9436"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:15px;fill:#ffffff"
y="237.09015"
x="238.9436"
id="tspan4225"
sodipodi:role="line">Stage fixes</tspan></text>
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 453.92578,261.95117 53.29102,30.76758 -53.29102,30.76953 0,-19.69726 -106.57422,0 0,-22.14258 106.57422,0 z"
id="path4227"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="398.9436"
y="297.09015"
id="text4229"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4231"
x="398.9436"
y="297.09015"
style="font-size:15px;fill:#ffffff">Commit</tspan></text>
<text
sodipodi:linespacing="125%"
id="text4256"
y="418.58173"
x="347.18027"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:12.5px"
y="418.58173"
x="347.18027"
id="tspan4258"
sodipodi:role="line">where files are</tspan><tspan
style="font-size:12.5px"
y="434.20673"
x="347.18027"
sodipodi:role="line"
id="tspan4266">marked for saving</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="506.06543"
y="418.58173"
id="text4260"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4262"
x="506.06543"
y="418.58173"
style="font-size:12.5px;fill:#696969">where history is</tspan><tspan
sodipodi:role="line"
x="506.06543"
y="434.20673"
style="font-size:12.5px;fill:#696969"
id="tspan4264">saved (invisible)</tspan></text>
<text
sodipodi:linespacing="125%"
id="text4268"
y="418.58173"
x="187.10397"
style="font-style:normal;font-weight:normal;font-size:30px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:12.5px"
y="418.58173"
x="187.10397"
id="tspan4270"
sodipodi:role="line">where you modify</tspan><tspan
style="font-size:12.5px"
y="434.20673"
x="187.10397"
sodipodi:role="line"
id="tspan4272">your files</tspan></text>
<path
inkscape:connector-curvature="0"
id="path4284"
d="m 128.97938,403.04078 120.40179,0"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 288.97938,403.04078 120.40179,0"
id="path4286"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path4288"
d="m 448.97938,403.04078 120.40179,0"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</svg>
......@@ -12,25 +12,6 @@
\providecommand{\myDepartment}{Department of Human Genetics}
\providecommand{\myCenter}{Center for Human and Clinical Genetics}
\definecolor{cblack}{rgb}{0,0,0}
\definecolor{cwhite}{rgb}{1,1,1}
\definecolor{command-color}{rgb}{0,0.5,0}
\definecolor{git-color}{rgb}{0.94,0.23,0.18}
\definecolor{option-color}{rgb}{0.9,0.2,0.11}
\definecolor{argument-color}{rgb}{0.11,0.27,0.7}
\definecolor{pattern-color}{rgb}{0,0.5,0.5}
\definecolor{wildcard-color}{rgb}{0.75,0.3,0}
\definecolor{cli-text}{rgb}{0.15,0.15,0.15}
\definecolor{important-note}{rgb}{0.69,0.13,0.13}
\definecolor{redirection}{rgb}{0.99,0.13,0.13}
\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
\definecolor{one-dot}{rgb}{0.9,0.2,0.0}
\definecolor{two-dots}{rgb}{0.11,0.11,0.8}
\definecolor{slash}{rgb}{0.3,0.3,0.3}
\definecolor{head}{HTML}{B22222}
\definecolor{branch}{HTML}{20b2aa}
\definecolor{commit-id}{HTML}{b8860b}
\usetheme{lumc}
......@@ -297,7 +278,7 @@
Creates branch \textcolor{branch}{\lstinline{lib}} at \textcolor{head}{\lstinline{HEAD}}.
\pause
\medskip
How can I see that it worked?
\pause
\vspace{-0.3cm}
......@@ -311,17 +292,17 @@
\end{framed}
\vspace{-0.2cm}
\pause
How can I switch to the new \textcolor{branch}{\lstinline{lib}} branch?
\end{pframe}
\begin{pframe}
\begin{framed}
\lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{checkout}} \textcolor{argument-color}{\lstinline{lib}}\\
\lstinline{Switched to branch '}\textcolor{branch}{\lstinline{lib}}\lstinline{'}
\end{framed}
\end{pframe}
\begin{pframe}
For Git pro's, in one command:
\begin{framed}
......@@ -441,7 +422,7 @@
\begin{pframe}
Make sure that the working directory is clean before merging.
\medskip
Otherwise:
\vspace{-0.3cm}
\begin{framed}
......@@ -513,7 +494,7 @@
\lstinline{* }\textcolor{commit-id}{\lstinline{5edaf08}}\lstinline{ (}\textcolor{branch}{\lstinline{hue}}\lstinline{) State character ...}\\
\lstinline{| * }\textcolor{commit-id}{\lstinline{f1ef19c}}\lstinline{ (}\textcolor{head}{\lstinline{HEAD}}\lstinline{, }\textcolor{branch}{\lstinline{master}}\lstinline{) State character ...}\\
\lstinline{|/}\\
\lstinline{* }\textcolor{commit-id}{\lstinline{1f6d2ab}}\lstinline{ Initial commit}
\lstinline{* }\textcolor{commit-id}{\lstinline{1f6d2ab}}\lstinline{ Initial commit}
\end{framed}
We'd like to merge branch \textcolor{branch}{\lstinline{hue}} into \textcolor{branch}{\lstinline{master}}.
......
\usepackage{framed}
\providecommand{\courseTitle}{Code and data management with Git}
\providecommand{\myDate}{22-11-2017}
\providecommand{\acknowledgements}{
......@@ -6,3 +8,31 @@
Szymon Kie{\l}basa\\
Jeroen Laros\\
}
\definecolor{cblack}{rgb}{0,0,0}
\definecolor{cwhite}{rgb}{1,1,1}
\definecolor{command-color}{rgb}{0,0.5,0}
\definecolor{git-color}{rgb}{0.94,0.23,0.18}
\definecolor{option-color}{HTML}{483d8b}
\definecolor{argument-color}{rgb}{0.11,0.27,0.7}
\definecolor{pattern-color}{rgb}{0,0.5,0.5}
\definecolor{wildcard-color}{rgb}{0.75,0.3,0}
\definecolor{cli-text}{rgb}{0.15,0.15,0.15}
\definecolor{important-note}{rgb}{0.69,0.13,0.13}
\definecolor{redirection}{rgb}{0.99,0.13,0.13}
\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
\definecolor{one-dot}{rgb}{0.9,0.2,0.0}
\definecolor{two-dots}{rgb}{0.11,0.11,0.8}
\definecolor{slash}{rgb}{0.3,0.3,0.3}
\definecolor{head}{HTML}{B22222}
\definecolor{branch}{HTML}{20b2aa}
\definecolor{commit-id}{HTML}{b8860b}
\newcommand{\gitcmd}{\textcolor{git-color}{\lstinline{git}}}
\newcommand{\prompt}{\lstinline{$}}
\newcommand{\cmd}[1]{\textcolor{command-color}{\lstinline{#1}}}
\newcommand{\cmdarg}[1]{\textcolor{argument-color}{\lstinline{#1}}}
\newcommand{\cmdopt}[1]{\textcolor{option-color}{\lstinline{#1}}}
\newcommand{\cliout}[1]{\textcolor{cli-text}{\lstinline{#1}}}
\newcommand{\important}[1]{\textbf{\textcolor{important-note}{#1}}}
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