Commit 1342d8b6 authored by Mihai's avatar Mihai

Extended basics practical + extraas

parent 0f3fd2ab
......@@ -111,7 +111,7 @@
\end{pframe}
\section{Git Operations}
\subsection{Checking the status of your files}
\subsection{Checking repository state}
\begin{pframe}
\begin{framed}
\prompt\ \gitcmd\ \cmd{status}\\
......@@ -119,17 +119,6 @@
\end{framed}
\end{pframe}
\begin{pframe}
Git itself will associate your files with various \textbf{states}
\footnote[1]{\scriptsize{Adapted from the
\href{http://git-scm.com/book/en/v2/Getting-Started-Git-Basics}
{Pro Git Book}.}}:
\begin{center}
\includegraphics[width=0.85\textwidth]{images/file_status_cycles.pdf}\\
\end{center}
\end{pframe}
\subsection{Checking the status of your files}
\begin{pframe}
\begin{framed}
\prompt\ \cmd{echo}\ \cmdarg{"First version."}\ \op{$>$}\ \cmdarg{README}
......@@ -151,6 +140,16 @@
\end{framed}
\end{pframe}
\subsection{Git file states}
\begin{pframe}
Git itself will associate your files with various \textbf{states}
\footnote[1]{\scriptsize{Adapted from the
\href{http://git-scm.com/book/en/v2/Getting-Started-Git-Basics}
{Pro Git Book}.}}:
\begin{center}
\includegraphics[width=0.85\textwidth]{images/file_status_cycles.pdf}\\
\end{center}
\end{pframe}
\subsection{Adding/staging files}
\begin{pframe}
......
......@@ -4,16 +4,23 @@
\providecommand{\handoutsTitle}{Git Basics}
\usepackage{multicol}
\usepackage{enumitem}
\usepackage{xcolor}
\usepackage{graphicx}
\usepackage{handouts}
\input{../shared/shared}
\begin{document}
\makeHeader
\subsubsection*{Connect to the education server}
Open \url{http://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html} in your browser.
\medskip
\medskip
Download and run \href{https://the.earth.li/~sgtatham/putty/latest/w32/putty.exe}{\textbf{putty.exe}. (Alternative binary files, the SSH and Telnet client itself)}.
\medskip
......@@ -33,6 +40,76 @@ Introduce your provided \textbf{username} and press enter.
Introduce your provided \textbf{password} and press enter.
\medskip
\section{General questions}
\begin{enumerate}
\item How can you check your local git repository state?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git state
\item git repository
\item git commit
\item git status
\item git show
\item git log
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item What command is used to stage a file?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git stage
\item git checkout
\item git add
\item git status
\item git diff
\item git log
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item How do you tell git what files to ignore?
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}[label=(\alph*)]
\item git ignore \{file-name\}
\item add the file paths to a file named ``.gitignore''
\item it is not possible
\item git not track \{file-name\}
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item The \gitcmd\ \cmd{commit}\ command:
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}[label=(\alph*)]
\item stages all the modified files
\item saves the staged files changes into the repository ``database''
\item retrieves old files into the working directory
\item shows a repository history and lets the user pick what commits to
discard
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item A file is brought into the modified state when:
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}
\item[[ ]] it is being staged
\item[[ ]] it is being edited by the user
\item[[ ]] the user checks out a previous version of it
\item[[ ]] the file is committed
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\end{enumerate}
\section{Practical exercises}
\subsubsection*{Local configuration}
First, let Git know what your name and e-mail address is:
\begin{lstlisting}
......
......@@ -3,32 +3,19 @@
\providecommand{\handoutsTitle}{\vspace{0.5cm}The git commit graph}
\usepackage{handouts}
\input{../shared/shared}
\usepackage{multicol}
\usepackage{enumitem}
\usepackage{xcolor}
\usepackage{graphicx}
\input{../shared/shared}
\begin{document}
\makeHeader
\section{General questions}
\begin{enumerate}
\item How do you check your local git repository state since your last commit?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git state
\item git repository
\item git commit
\item git status
\item git show
\item git log
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item A branch is:
\vspace{-0.2cm}
\begin{multicols}{3}
......@@ -43,6 +30,20 @@
\end{multicols}
\vspace{-0.3cm}
\item How can you see the commit history in a tree alike manner?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git state
\item git repository
\item git commit
\item git status --tree
\item git show tree
\item git log --graph
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item What command could be used in joining two or more development histories (branches) together?
\vspace{-0.2cm}
\begin{multicols}{3}
......@@ -70,7 +71,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item Which of the following creates a new branch called \colorbox{gray!20}{brand\_new} and also checks it out?
\vspace{-0.2cm}
\begin{multicols}{3}
......@@ -84,7 +85,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item In order to merge a branch do we have to add and commit, or discard any changes first?
\vspace{-0.2cm}
\begin{multicols}{2}
......@@ -94,7 +95,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item If we want to merge \colorbox{gray!20}{brand\_new} into \colorbox{gray!20}{master}, which branch should be checked out when we run the command \colorbox{gray!20}{git merge brand\_new}?
\vspace{-0.2cm}
\begin{multicols}{2}
......@@ -106,7 +107,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item Which of the following commands will delete the branch \colorbox{gray!20}{brand\_new}?
\vspace{-0.2cm}
\begin{multicols}{2}
......@@ -130,7 +131,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\end{enumerate}
\section{Inspecting the commit graph}
......@@ -169,7 +170,7 @@ Please navigate to that directory and try to use the commands presented during t
\item master
\end{enumerate}
\end{multicols}
\item The commit graph looks like:
\vspace{-0.2cm}
\begin{center}
......@@ -186,7 +187,7 @@ Please navigate to that directory and try to use the commands presented during t
\item advanced
\end{enumerate}
\end{multicols}
\item Merge branch \colorbox{gray!20}{documentation} into \colorbox{gray!20}{master}.
\item What merge type is performed if branch \colorbox{gray!20}{data} is merged into \colorbox{gray!20}{master}?
......@@ -201,7 +202,7 @@ Please navigate to that directory and try to use the commands presented during t
\end{multicols}
\item Merge branch \colorbox{gray!20}{data} into \colorbox{gray!20}{master}.
\end{enumerate}
......@@ -215,20 +216,20 @@ Next, you will make some file changes and manipulate the commit graph even furth
\begin{enumerate}
\item Checkout branch \colorbox{gray!20}{data} and create a new branch called \colorbox{gray!20}{data-europe}.
\vspace{-0.2cm}
\item Checkout branch \colorbox{gray!20}{data-europe}.
\vspace{-0.1cm}
\item Edit the \colorbox{gray!20}{data/capitals.txt} file by adding at the end of it Rome as Italy's capital (``Italy:Rome'').
Do not remove or make any changes to the information already present there.
\vspace{-0.1cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data} and merge the \colorbox{gray!20}{data-europe} branch into it.
\vspace{-0.1cm}
\item Why was the previous merge a fast-forward one?
\vspace{-0.3cm}
\begin{multicols}{2}
......@@ -239,7 +240,7 @@ Next, you will make some file changes and manipulate the commit graph even furth
\item none of the above
\end{enumerate}
\end{multicols}
\end{enumerate}
\subsection{Three-way merging without conflicts}
......@@ -247,24 +248,24 @@ Next, you will make some file changes and manipulate the commit graph even furth
\begin{enumerate}
\item Make sure branch \colorbox{gray!20}{data} is active (checkedout).
\vspace{-0.2cm}
\item Correct the USA capital to Washington D.C. in the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.1cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data-europe}.
\vspace{-0.2cm}
\item Add Paris as capital of France at the end of the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.2cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data} and merge into it the \colorbox{gray!20}{data-europe} branch.
\end{enumerate}
\subsection{Resolving a merge conflict}
......@@ -272,27 +273,27 @@ Next, you will make some file changes and manipulate the commit graph even furth
\begin{enumerate}
\item Make sure branch \colorbox{gray!20}{data} is active (checkedout).
\vspace{-0.1cm}
\item Add Moscow as capital of Russia at the end of the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.2cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data-europe}.
\vspace{-0.2cm}
\item Add Madrid as Spain's capital at the of the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.2cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data} and merge into it the \colorbox{gray!20}{data-europe} branch.
\vspace{-0.1cm}
\item Solve the merge conflict that was created during the previous step.
\end{enumerate}
......@@ -318,7 +319,7 @@ Next, you will make some file changes and manipulate the commit graph even furth
\item 1.7 - c
\item 1.8 - d
\item 1.9 - c
\item 2.1 - d
\item 2.1 - d
\item 2.2 - b
\item 2.3 - d
\item 2.4 - c
......
......@@ -1385,9 +1385,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.16239535"
inkscape:cx="637.05476"
inkscape:cy="-2847.0434"
inkscape:zoom="0.6495814"
inkscape:cx="683.27846"
inkscape:cy="600.87244"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
......@@ -1404,11 +1404,11 @@
inkscape:guide-bbox="true"
units="mm">
<sodipodi:guide
position="1250.3858,3515.1424"
position="1250.3858,1335.1424"
orientation="1,0"
id="guide5111" />
<sodipodi:guide
position="1245.1046,3513.5074"
position="1245.1046,1333.5074"
orientation="0,1"
id="guide5113" />
</sodipodi:namedview>
......@@ -1428,7 +1428,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-63.5398,-2847.7809)">
transform="translate(-63.5398,-667.7809)">
<path
sodipodi:nodetypes="ccccccccccc"
inkscape:connector-curvature="0"
......@@ -2553,42 +2553,6 @@
y="1020.3447"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1"
id="tspan15897">Add script.</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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:1.5;stroke-linecap:round;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 404.85653,930.75671 97.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.40247 l 0,25.68182 c 0,0.77696 -0.54983,1.40246 -1.23281,1.40246 l -80.30756,0 -3.29129,25.04183 -4.13762,-25.04183 -9.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.40246 l 0,-25.68182 c 0,-0.77697 0.54983,-1.40247 1.23281,-1.40247 z"
id="rect15899"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ssssscccssss" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="454.0087"
y="951.52411"
id="text15901"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan15903"
x="454.0087"
y="951.52411"
style="font-size:17.5px;fill:#4682b4">Commit id</tspan></text>
<path
sodipodi:nodetypes="ssssscccssss"
inkscape:connector-curvature="0"
id="path15906"
d="m 374.85653,1079.4425 157.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-25.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -110.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -39.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,25.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:1.5;stroke-linecap:round;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="text15908"
y="1071.5242"
x="454.0087"
style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:17.5px;fill:#4682b4"
y="1071.5242"
x="454.0087"
id="tspan15910"
sodipodi:role="line">Commit message</tspan></text>
<path
id="path16063"
d="m 63.5398,1387.7809 0,656 0,17.2285 294.99219,0 473.00781,0 294.9922,0 0,-17.2285 0,-638.7715 0,-17.2285 -294.9922,0 -768,0 z"
......@@ -13325,7 +13289,7 @@
sodipodi:role="line">Commit</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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:1.5;stroke-linecap:round;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 404.85653,2350.7567 97.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.4025 l 0,25.6818 c 0,0.777 -0.54983,1.4025 -1.23281,1.4025 l -80.30756,0 -3.29129,25.0418 -4.13762,-25.0418 -9.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.4025 l 0,-25.6818 c 0,-0.777 0.54983,-1.4025 1.23281,-1.4025 z"
d="m 372.85653,2330.7567 161.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.4025 l 0,45.6818 c 0,0.777 -0.54983,1.4025 -1.23281,1.4025 l -112.30756,0 -3.29129,25.0418 -4.13762,-25.0418 -41.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 0.54983,-1.4025 1.23281,-1.4025 z"
id="path7201"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ssssscccssss" />
......@@ -13333,32 +13297,44 @@
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="454.0087"
y="2371.5242"
y="2349.5242"
id="text7203"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan7205"
x="454.0087"
y="2371.5242"
style="font-size:17.5px;fill:#4682b4">Commit id</tspan></text>
y="2349.5242"
style="font-size:17.5px;fill:#4682b4">Commit <tspan
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'"
id="tspan7083">id</tspan></tspan><tspan
sodipodi:role="line"
x="454.0087"
y="2371.3992"
style="font-size:17.5px;fill:#4682b4"
id="tspan7081">(generated by git)</tspan></text>
<path
sodipodi:nodetypes="ssssscccssss"
inkscape:connector-curvature="0"
id="path7207"
d="m 374.85653,2519.4425 157.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-25.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -110.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -39.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,25.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 z"
d="m 348.85653,2539.4425 197.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -130.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -59.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,45.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:1.5;stroke-linecap:round;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="text7209"
y="2511.5242"
x="454.0087"
y="2509.5242"
x="448.0087"
style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:17.5px;fill:#4682b4"
y="2511.5242"
x="454.0087"
y="2509.5242"
x="448.0087"
id="tspan7211"
sodipodi:role="line">Commit message</tspan></text>
sodipodi:role="line">Commit message</tspan><tspan
style="font-size:17.5px;fill:#4682b4"
y="2531.3992"
x="448.0087"
sodipodi:role="line"
id="tspan7087">(specified by the user)</tspan></text>
<path
id="path7213"
d="m 63.5398,2847.7809 0,656 0,17.2285 294.99219,0 473.00781,0 294.9922,0 0,-17.2285 0,-638.7715 0,-17.2285 -294.9922,0 -768,0 z"
......@@ -14197,5 +14173,53 @@
id="path7739"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="ssssscccssss"
inkscape:connector-curvature="0"
id="path7082"
d="m 372.85653,910.7567 161.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.4025 l 0,45.6818 c 0,0.777 -0.54983,1.4025 -1.23281,1.4025 l -112.30756,0 -3.29129,25.0418 -4.13762,-25.0418 -41.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 0.54983,-1.4025 1.23281,-1.4025 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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:1.5;stroke-linecap:round;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="text7084"
y="929.52417"
x="454.0087"
style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:17.5px;fill:#4682b4"
y="929.52417"
x="454.0087"
id="tspan7086"
sodipodi:role="line">Commit <tspan
id="tspan7088"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">id</tspan></tspan><tspan
id="tspan7090"
style="font-size:17.5px;fill:#4682b4"
y="951.39917"
x="454.0087"
sodipodi:role="line">(generated by git)</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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:1.5;stroke-linecap:round;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 348.85653,1099.4425 197.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -130.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -59.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,45.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 z"
id="path7092"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ssssscccssss" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="448.0087"
y="1069.5242"
id="text7094"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan7096"
x="448.0087"
y="1069.5242"
style="font-size:17.5px;fill:#4682b4">Commit message</tspan><tspan
id="tspan7098"
sodipodi:role="line"
x="448.0087"
y="1091.3992"
style="font-size:17.5px;fill:#4682b4">(specified by the user)</tspan></text>
</g>
</svg>
......@@ -3,6 +3,12 @@
\providecommand{\handoutsTitle}{Git and remote repositories}
\usepackage{handouts}
\usepackage{multicol}
\usepackage{enumitem}
\usepackage{xcolor}
\usepackage{graphicx}
\input{../shared/shared}
\begin{document}
......@@ -89,7 +95,7 @@ server.
\subsubsection*{Collaboration}
In this practical, you'll work with both your repository and with the repository your neighbour created
during the previous practical. We'll refer to this repository as {\bf N}, and
to your own repository from the previous practical as {\bf Y}. Note that by now both repositories should have a
to your own repository from the previous practical as {\bf Y}. Note that by now both repositories should have a
corresponding GitLab project (a remote repository).
\bigskip
......
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