From a82198a7cb13455afa4a801ac0569c91a46a0746 Mon Sep 17 00:00:00 2001
From: Stephane Caron <stephane.caron@ens.fr>
Date: Wed, 23 May 2012 10:37:59 -0700
Subject: all local changes (repo is moving to the NetApp)

---
 git-workshop/figures/git-pull-2.svg |  61 +--
 git-workshop/figures/git-pull-3.svg | 877 ++++++++++++++++++++++++++++++++++++
 git-workshop/workshop.tex           |   2 +-
 3 files changed, 910 insertions(+), 30 deletions(-)
 create mode 100644 git-workshop/figures/git-pull-3.svg

(limited to 'git-workshop')

diff --git a/git-workshop/figures/git-pull-2.svg b/git-workshop/figures/git-pull-2.svg
index 9384fbb..a9b0832 100644
--- a/git-workshop/figures/git-pull-2.svg
+++ b/git-workshop/figures/git-pull-2.svg
@@ -14,7 +14,7 @@
    height="340.15747"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="git-pull-2.svg"
    version="1.0">
   <defs
@@ -338,14 +338,14 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.540463"
-     inkscape:cx="228.3608"
+     inkscape:cx="121.8993"
      inkscape:cy="150.07961"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1600"
-     inkscape:window-height="845"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:current-layer="g6462"
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      width="12.8cm"
      height="9.6cm"
      units="cm"
@@ -401,7 +401,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -510,7 +510,7 @@
            y="967.32281"
            x="44.125977"
            id="tspan5457-98-6"
-           sodipodi:role="line">Commit C</tspan></text>
+           sodipodi:role="line">Commit D</tspan></text>
     </g>
     <path
        style="opacity:1;fill:none;stroke:#000000;stroke-width:0.99921262000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
@@ -549,25 +549,28 @@
     <g
        id="g6462"
        transform="translate(-268.20472,-49.606316)">
-      <rect
-         y="931.88977"
-         x="289.46454"
-         height="56.692921"
-         width="141.7323"
-         id="rect2995-59-5-2"
-         style="opacity:0.5;fill:url(#linearGradient3858-0);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:4.5, 4.5;stroke-dashoffset:0"
+         id="path4330"
+         sodipodi:cx="88.58268"
+         sodipodi:cy="237.40157"
+         sodipodi:rx="38.976379"
+         sodipodi:ry="38.976379"
+         d="m 127.55906,237.40157 c 0,21.52606 -17.45032,38.97637 -38.97638,38.97637 -21.52606,0 -38.97638,-17.45031 -38.97638,-38.97637 0,-21.52606 17.45032,-38.97638 38.97638,-38.97638 21.52606,0 38.97638,17.45032 38.97638,38.97638 z"
+         transform="translate(271.74802,733.46459)" />
       <text
+         xml:space="preserve"
+         style="font-size:49.28142166px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="332.25723"
+         y="1032.5483"
+         id="text4332"
          sodipodi:linespacing="125%"
-         id="text5455-1-5-5"
-         y="967.32281"
-         x="310.7244"
-         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-size:20px"
-           y="967.32281"
-           x="310.7244"
-           id="tspan5457-98-6-2"
-           sodipodi:role="line">Commit C</tspan></text>
+         transform="scale(1.0486031,0.95364966)"><tspan
+           sodipodi:role="line"
+           id="tspan4334"
+           x="332.25723"
+           y="1032.5483">?</tspan></text>
     </g>
     <path
        style="opacity:0.69999999999999996;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.54330709;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Send)"
@@ -599,7 +602,7 @@
          y="742.8045" /></text>
     <path
        style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow2Sstart);marker-end:none"
-       d="m 191.33858,903.5433 c 66.81332,0 66.81332,0 66.81332,0"
+       d="m 191.33858,911.5433 c 66.81332,0 66.81332,0 66.81332,0"
        id="path5656-4"
        inkscape:connector-curvature="0" />
     <text
@@ -615,13 +618,13 @@
          y="891.81128"
          style="font-size:20px;fill:#ff0000;font-family:courier;-inkscape-font-specification:courier">git pull</tspan></text>
     <path
-       style="fill:#800000;stroke:#800000;stroke-width:17.71653543000000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.75000000000000000"
+       style="fill:#800000;stroke:#800000;stroke-width:17.71653543000000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:1"
        d="M 192.15002,142.8142 C 257.01148,77.952746 257.01148,77.952746 257.01148,77.952746"
        id="path7431"
        inkscape:connector-curvature="0"
        transform="translate(-4.149475e-6,698.0315)" />
     <path
-       style="fill:#800000;stroke:#800000;stroke-width:17.71653543000000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.75"
+       style="fill:#800000;stroke:#800000;stroke-width:17.71653543000000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:1"
        d="m 193.44833,79.846123 c 61.88615,61.886147 61.88615,61.886147 61.88615,61.886147"
        id="path7433"
        inkscape:connector-curvature="0"
diff --git a/git-workshop/figures/git-pull-3.svg b/git-workshop/figures/git-pull-3.svg
new file mode 100644
index 0000000..536e801
--- /dev/null
+++ b/git-workshop/figures/git-pull-3.svg
@@ -0,0 +1,877 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="453.5433"
+   height="340.15747"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="git-pull-3.svg"
+   version="1.0">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path3919"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.3) translate(-2.3,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient6454">
+      <stop
+         style="stop-color:#840000;stop-opacity:1;"
+         offset="0"
+         id="stop6456" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop6458" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Send"
+       style="overflow:visible;">
+      <path
+         id="path3922"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.3) rotate(180) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path3910"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3898"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3892"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3889"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;">
+      <path
+         id="path3904"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.2) rotate(180) translate(6,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient3765">
+      <stop
+         style="stop-color:#7cff8e;stop-opacity:0.42424244;"
+         offset="0"
+         id="stop3767" />
+      <stop
+         style="stop-color:#00ae00;stop-opacity:0.54545456;"
+         offset="1"
+         id="stop3769" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765-5"
+       id="linearGradient3773-9"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.64915963,698.0315)" />
+    <linearGradient
+       id="linearGradient3765-5">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-8" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765-9"
+       id="linearGradient3773-4"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0989933,0,0,1.1054854,-24.018391,689.24045)" />
+    <linearGradient
+       id="linearGradient3765-9">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-103.64657,767.19322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3824"
+       xlink:href="#linearGradient3765-9"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.0989933,0,0,1.1054854,-24.018391,781.36643)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3824-8"
+       xlink:href="#linearGradient3765-9-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-1">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-3" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-9" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-103.64657,852.2326)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3858"
+       xlink:href="#linearGradient3765-9-1"
+       inkscape:collect="always" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3898-0"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5557"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5559"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       id="linearGradient3765-9-1-5">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-3-7" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-9-8" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-55.646569,774.27981)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3824-86"
+       xlink:href="#linearGradient3765-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-7">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,767.19322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5577"
+       xlink:href="#linearGradient3765-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient6492"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-103.64657,682.15385)"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient6546"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4653243,0,0,1.1054854,162.95185,682.1538)"
+       x1="85.837677"
+       y1="97.697899"
+       x2="183.56184"
+       y2="97.697899" />
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart-3"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3919-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-1"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3898-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,767.19322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5577-4"
+       xlink:href="#linearGradient3765-9-7-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-7-6">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5-6" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6-6" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,-103.64657,852.2326)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3858-2"
+       xlink:href="#linearGradient3765-9-1-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-1-6">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-3-3" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-9-5" />
+    </linearGradient>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,767.19322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5577-4-9"
+       xlink:href="#linearGradient3765-9-7-6-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-7-6-5">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5-6-9" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6-6-6" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send-2"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3904-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-8"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3898-1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <linearGradient
+       y2="97.697899"
+       x2="183.56184"
+       y1="97.697899"
+       x1="85.837677"
+       gradientTransform="matrix(1.4653245,0,0,1.1054854,162.95185,767.19322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5577-4-9-8"
+       xlink:href="#linearGradient3765-9-7-6-5-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3765-9-7-6-5-3">
+      <stop
+         style="stop-color:#fff293;stop-opacity:1;"
+         offset="0"
+         id="stop3767-3-5-6-9-7" />
+      <stop
+         style="stop-color:#ff9600;stop-opacity:0;"
+         offset="1"
+         id="stop3769-0-6-6-6-1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.1785437"
+     inkscape:cx="185.31173"
+     inkscape:cy="180.63523"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     width="12.8cm"
+     height="9.6cm"
+     units="cm"
+     showgrid="true"
+     grid_units="mm"
+     inkscape:object-paths="false"
+     inkscape:grid-points="true"
+     inkscape:grid-bbox="true"
+     inkscape:guide-points="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       orientation="vertical"
+       position="56.476527"
+       id="guide3573" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="11.035643"
+       id="guide3579" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="24.018753"
+       id="guide3886" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="285.62841"
+       id="guide3988" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="303.15561"
+       id="guide4081" />
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="2mm"
+       spacingy="2mm"
+       color="#3f3fff"
+       empcolor="#3f3fff"
+       opacity="0.15"
+       empopacity="0.38"
+       empspacing="5" />
+  </sodipodi:namedview>
+  <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(4.149475e-6,-698.0315)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+       d="m 361.41731,768.89764 0,28.34645"
+       id="path3883"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 361.41731,853.93701 c 0,28.34645 0,28.34645 0,28.34645"
+       id="path5265"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6477"
+       transform="translate(267.68503,-49.606324)">
+      <rect
+         y="761.81104"
+         x="22.866135"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995"
+         style="fill:url(#linearGradient6492);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455"
+         y="797.24408"
+         x="44.125977"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="797.24408"
+           x="44.125977"
+           id="tspan5457"
+           sodipodi:role="line">Commit A</tspan></text>
+    </g>
+    <g
+       id="g6472"
+       transform="translate(-268.20472,-49.606316)">
+      <rect
+         y="761.81104"
+         x="289.46457"
+         height="56.692921"
+         width="141.73227"
+         id="rect2995-5"
+         style="fill:url(#linearGradient6546);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-4"
+         y="797.24408"
+         x="310.7244"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="797.24408"
+           x="310.7244"
+           id="tspan5457-9"
+           sodipodi:role="line">Commit A</tspan></text>
+    </g>
+    <g
+       id="g6482"
+       transform="translate(267.68503,-49.606324)">
+      <rect
+         y="846.8504"
+         x="22.866135"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59"
+         style="fill:url(#linearGradient3824);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1"
+         y="882.28345"
+         x="44.125977"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="882.28345"
+           x="44.125977"
+           id="tspan5457-98"
+           sodipodi:role="line">Commit C</tspan></text>
+    </g>
+    <g
+       id="g6487"
+       transform="translate(267.68503,-49.606324)">
+      <rect
+         y="931.88977"
+         x="22.866135"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-5"
+         style="fill:url(#linearGradient3858);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-5"
+         y="967.32281"
+         x="44.125977"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="967.32281"
+           x="44.125977"
+           id="tspan5457-98-6"
+           sodipodi:role="line">Commit D</tspan></text>
+    </g>
+    <path
+       style="opacity:1;fill:none;stroke:#000000;stroke-width:0.99921262000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+       d="m 92.125973,768.89765 0,28.34645"
+       id="path3883-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 92.125973,853.93702 c 0,28.34645 0,28.34645 0,28.34645"
+       id="path5265-6"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6467"
+       transform="translate(-268.20472,-49.606316)"
+       style="opacity:1">
+      <rect
+         y="846.8504"
+         x="289.46454"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-50"
+         style="opacity:1;fill:url(#linearGradient5577);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-2"
+         y="882.28345"
+         x="310.7244"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:1;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="882.28345"
+           x="310.7244"
+           id="tspan5457-98-3"
+           sodipodi:role="line">Commit B</tspan></text>
+    </g>
+    <g
+       id="g6462"
+       transform="translate(-268.20472,-49.606316)">
+      <path
+         sodipodi:type="arc"
+         style="fill:#c4c9e1;fill-opacity:1;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-opacity:0.36529679;stroke-dasharray:4.5, 4.5;stroke-dashoffset:0"
+         id="path4330"
+         sodipodi:cx="88.58268"
+         sodipodi:cy="237.40157"
+         sodipodi:rx="38.976379"
+         sodipodi:ry="38.976379"
+         d="m 127.55906,237.40157 c 0,21.52606 -17.45032,38.97637 -38.97638,38.97637 -21.52606,0 -38.97638,-17.45031 -38.97638,-38.97637 0,-21.52606 17.45032,-38.97638 38.97638,-38.97638 21.52606,0 38.97638,17.45032 38.97638,38.97638 z"
+         transform="translate(271.74802,733.46459)" />
+    </g>
+    <path
+       style="opacity:0.69999999999999996;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.54330709;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Send)"
+       d="m 191.56462,819.22518 c 66.81332,0 66.81332,0 66.81332,0"
+       id="path5656"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="177.57654"
+       y="807.49316"
+       id="text6438"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6440"
+         x="177.57654"
+         y="807.49316"
+         style="font-size:20px;fill:#ff0000;font-family:courier;-inkscape-font-specification:courier">git push</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="39.475903"
+       y="742.8045"
+       id="text6442"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6444"
+         x="39.475903"
+         y="742.8045" /></text>
+    <path
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow2Sstart);marker-end:none"
+       d="m 191.33858,911.5433 c 66.81332,0 66.81332,0 66.81332,0"
+       id="path5656-4"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="177.35049"
+       y="891.81128"
+       id="text6438-2"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6440-7"
+         x="177.35049"
+         y="891.81128"
+         style="font-size:20px;fill:#ff0000;font-family:courier;-inkscape-font-specification:courier">git pull</tspan></text>
+    <path
+       style="fill:#800000;stroke:#800000;stroke-width:17.71653543000000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:1"
+       d="M 192.15002,142.8142 C 257.01148,77.952746 257.01148,77.952746 257.01148,77.952746"
+       id="path7431"
+       inkscape:connector-curvature="0"
+       transform="translate(-4.149475e-6,698.0315)" />
+    <path
+       style="fill:#800000;stroke:#800000;stroke-width:17.71653543000000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:1"
+       d="m 193.44833,79.846123 c 61.88615,61.886147 61.88615,61.886147 61.88615,61.886147"
+       id="path7433"
+       inkscape:connector-curvature="0"
+       transform="translate(-4.149475e-6,698.0315)" />
+    <path
+       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 92.12598,960.23621 c 0,28.34645 0,28.34645 0,28.34645"
+       id="path5265-6-1"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6467-4"
+       transform="matrix(0.19187146,0,0,0.19187146,4.1603799,750.43152)">
+      <rect
+         y="846.8504"
+         x="289.46454"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-50-0"
+         style="fill:url(#linearGradient5577-4);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-2-1"
+         y="882.28345"
+         x="310.7244"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="882.28345"
+           x="310.7244"
+           id="tspan5457-98-3-7"
+           sodipodi:role="line">Commit B</tspan></text>
+    </g>
+    <g
+       id="g6487-0"
+       transform="matrix(0.19187146,0,0,0.19187146,90.746079,741.2015)">
+      <rect
+         y="931.88977"
+         x="22.866135"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-5-0"
+         style="fill:url(#linearGradient3858-2);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-5-2"
+         y="967.32281"
+         x="44.125977"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="967.32281"
+           x="44.125977"
+           id="tspan5457-98-6-6"
+           sodipodi:role="line">Commit D</tspan></text>
+    </g>
+    <g
+       id="g6467-4-4"
+       transform="translate(-268.20472,141.73227)">
+      <rect
+         y="846.8504"
+         x="289.46454"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-50-0-9"
+         style="fill:url(#linearGradient5577-4-9);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-2-1-1"
+         y="882.28345"
+         x="310.7244"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="882.28345"
+           x="310.7244"
+           id="tspan5457-98-3-7-7"
+           sodipodi:role="line">Commit E</tspan></text>
+    </g>
+    <path
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Send)"
+       d="m 195.3914,1025.1024 c 66.81332,0 66.81332,0 66.81332,0"
+       id="path5656-2"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="181.40332"
+       y="1013.3703"
+       id="text6438-3"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6440-5"
+         x="181.40332"
+         y="1013.3703"
+         style="font-size:20px;fill:#ff0000;font-family:courier;-inkscape-font-specification:courier">git push</tspan></text>
+    <path
+       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1.32287562000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+       d="m 361.41732,938.97637 c 0,49.60629 0,49.60629 0,49.60629"
+       id="path5265-6-1-6"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6467-4-4-8"
+       transform="translate(1.0866187,141.73227)"
+       style="opacity:0.5">
+      <rect
+         y="846.8504"
+         x="289.46454"
+         height="56.692921"
+         width="141.7323"
+         id="rect2995-59-50-0-9-2"
+         style="fill:url(#linearGradient5577-4-9-8);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27174878000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5455-1-2-1-1-7"
+         y="882.28345"
+         x="310.7244"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-size:20px"
+           y="882.28345"
+           x="310.7244"
+           id="tspan5457-98-3-7-7-6"
+           sodipodi:role="line">Commit E</tspan></text>
+    </g>
+    <path
+       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1.13885593;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Send)"
+       d="M 92.12598,882.28346 70.866138,910.62992"
+       id="path4589"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1.04044771px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Send)"
+       d="m 92.12598,882.28346 14.17323,35.43307"
+       id="path5003"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:0.98338592px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
+       d="m 70.866138,924.80314 c 21.259842,35.43307 21.259842,35.43307 21.259842,35.43307 l 0,0"
+       id="path5211"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:0.76655817px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Send)"
+       d="M 106.29921,931.88976 C 92.12598,960.23621 92.12598,960.23621 92.12598,960.23621"
+       id="path5213"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/git-workshop/workshop.tex b/git-workshop/workshop.tex
index b9cdc93..b404490 100644
--- a/git-workshop/workshop.tex
+++ b/git-workshop/workshop.tex
@@ -10,7 +10,7 @@
 %\setbeamercovered{transparent}
 \usecolortheme{crane}
 
-\author[SC \& HT]{Stéphane Caron \and Thibaut Horel}
+\author[SC \& TH]{Stéphane Caron \and Thibaut Horel}
 \institute{Technicolor Palo Alto}
 \date{\today}
 \title{Git Workshop}
-- 
cgit v1.2.3-70-g09d2