Commit 03bb4e2f authored by Mihai's avatar Mihai

Merging draft ready

parent 2ec9a9c4
......@@ -10,8 +10,8 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="300.00003mm"
height="189.99992mm"
viewBox="0 0 1062.9922 673.22806"
height="190.00005mm"
viewBox="0 0 1062.9922 673.22852"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
......@@ -1916,7 +1916,7 @@
inkscape:pageshadow="2"
inkscape:zoom="0.45932341"
inkscape:cx="204.42657"
inkscape:cy="990.32019"
inkscape:cy="-446.35603"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
......@@ -1933,11 +1933,11 @@
inkscape:guide-bbox="true"
units="mm">
<sodipodi:guide
position="1250.3858,10155.142"
position="1250.3858,9415.1432"
orientation="1,0"
id="guide5111" />
<sodipodi:guide
position="1245.1046,10153.507"
position="1245.1046,9413.5082"
orientation="0,1"
id="guide5113" />
</sodipodi:namedview>
......@@ -1957,7 +1957,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-63.5398,-9487.7809)">
transform="translate(-63.5398,-8747.7809)">
<path
id="path17703"
d="m 63.5398,8747.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"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -34,10 +34,6 @@ you draw it on paper?
\emph{Hint:} Use \lstinline{git log} with the appropriate arguments.
\bigskip
As an alternative to \lstinline{git log}, you can also try a graphical viewer
such as \lstinline{gitg} (installed on the course laptops) or \lstinline{gitk}.
\bigskip
\subsubsection*{Fast-forward merging}
Of course we want the nice commit your neighbour just made in our
\lstinline{master} branch.
......
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