Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
courses
Git course
Commits
03bb4e2f
Commit
03bb4e2f
authored
Sep 05, 2017
by
Mihai Lefter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merging draft ready
parent
2ec9a9c4
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5619 additions
and
246 deletions
+5619
-246
merging/images/commit_graph/commit_graph_00.svg
merging/images/commit_graph/commit_graph_00.svg
+6
-6
merging/images/fast_forward/fast_forward_00.svg
merging/images/fast_forward/fast_forward_00.svg
+2224
-0
merging/images/three_way/three_way_00.svg
merging/images/three_way/three_way_00.svg
+3114
-0
merging/merging.tex
merging/merging.tex
+275
-236
merging/merging_handouts.tex
merging/merging_handouts.tex
+0
-4
No files found.
merging/images/commit_graph/commit_graph_00.svg
View file @
03bb4e2f
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="300.00003mm"
width="300.00003mm"
height="1
89.99992
mm"
height="1
90.00005
mm"
viewBox="0 0 1062.9922 673.228
06
"
viewBox="0 0 1062.9922 673.228
52
"
id="svg2"
id="svg2"
version="1.1"
version="1.1"
inkscape:version="0.91 r13725"
inkscape:version="0.91 r13725"
...
@@ -1916,7 +1916,7 @@
...
@@ -1916,7 +1916,7 @@
inkscape:pageshadow="2"
inkscape:pageshadow="2"
inkscape:zoom="0.45932341"
inkscape:zoom="0.45932341"
inkscape:cx="204.42657"
inkscape:cx="204.42657"
inkscape:cy="
990.32019
"
inkscape:cy="
-446.35603
"
inkscape:document-units="px"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:current-layer="layer1"
showgrid="false"
showgrid="false"
...
@@ -1933,11 +1933,11 @@
...
@@ -1933,11 +1933,11 @@
inkscape:guide-bbox="true"
inkscape:guide-bbox="true"
units="mm">
units="mm">
<sodipodi:guide
<sodipodi:guide
position="1250.3858,
1015
5.142"
position="1250.3858,
941
5.14
3
2"
orientation="1,0"
orientation="1,0"
id="guide5111" />
id="guide5111" />
<sodipodi:guide
<sodipodi:guide
position="1245.1046,
1015
3.50
7
"
position="1245.1046,
941
3.50
82
"
orientation="0,1"
orientation="0,1"
id="guide5113" />
id="guide5113" />
</sodipodi:namedview>
</sodipodi:namedview>
...
@@ -1957,7 +1957,7 @@
...
@@ -1957,7 +1957,7 @@
inkscape:label="Layer 1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
inkscape:groupmode="layer"
id="layer1"
id="layer1"
transform="translate(-63.5398,-
948
7.7809)">
transform="translate(-63.5398,-
874
7.7809)">
<path
<path
id="path17703"
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"
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"
...
...
merging/images/fast_forward/fast_forward_00.svg
0 → 100644
View file @
03bb4e2f
This diff is collapsed.
Click to expand it.
merging/images/three_way/three_way_00.svg
0 → 100644
View file @
03bb4e2f
This diff is collapsed.
Click to expand it.
merging/merging.tex
View file @
03bb4e2f
This diff is collapsed.
Click to expand it.
merging/merging_handouts.tex
View file @
03bb4e2f
...
@@ -34,10 +34,6 @@ you draw it on paper?
...
@@ -34,10 +34,6 @@ you draw it on paper?
\emph
{
Hint:
}
Use
\lstinline
{
git log
}
with the appropriate arguments.
\emph
{
Hint:
}
Use
\lstinline
{
git log
}
with the appropriate arguments.
\bigskip
\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
}
\subsubsection*
{
Fast-forward merging
}
Of course we want the nice commit your neighbour just made in our
Of course we want the nice commit your neighbour just made in our
\lstinline
{
master
}
branch.
\lstinline
{
master
}
branch.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment