Merge branch 'master' of palosgit01:/mnt/repos/git/git_workshop

1 files changed, 32 insertions, 29 deletions

diff --git a/figures/git-pull-2.svg b/figures/git-pull-2.svg
index 9384fbb..a9b0832 100644
--- a/figures/git-pull-2.svg
+++ b/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"