Git and GitHub

README.md

Clone me with the URL at right! Make changes!

history.svg

operations.svg

<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg id="mermaidChart0" width="850" xmlns="http://www.w3.org/2000/svg" height="495" viewBox="-50 -10 850 495">
<desc>
%% sequenceDiagram made with https://github.com/knsv/mermaid/tree/0.4.0
  participant working
  participant index
  participant local
  participant remote
  remote->>local: clone
  local-->>working: clone
  remote->>local: fetch
  local->>local: merge
  local-->>working: merge
  local->>working: checkout
  working->>index: add
  index->>working: reset
  index->>local: commit
  local->>local: rebase
  local-->>working: rebase
  local->>remote: push
</desc>
<style type="text/css" title="mermaid-svg-internal-css">/* <![CDATA[ */
text { font-size: 20px; font-family: 'Trebuchet MS', Helvetica, sans-serif; }
text.actor { font-weight: bold; }
/* ]]> */
</style>
<g><line x1="75" y1="5" x2="75" y2="2000" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#cfe5c9" stroke="#666" width="150" height="65" rx="20" ry="20" class="actor"></rect>
<text x="75" y="37.5" class="actor" style="text-anchor: middle;">
<tspan x="75" y="28">working</tspan><tspan x="75" dy="24">directory</tspan></text></g>
<g><line x1="275" y1="5" x2="275" y2="2000" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#f6fbbe" stroke="#666" width="150" height="65" rx="20" ry="20" class="actor"></rect>
<text x="275" y="37.5" class="actor" style="text-anchor: middle;">
<tspan x="275" y="28">staging</tspan><tspan x="275" dy="24">index</tspan></text></g>
<g><line x1="475" y1="5" x2="475" y2="2000" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#9bc3ef" stroke="#666" width="150" height="65" rx="20" ry="20" class="actor"></rect>
<text x="475" y="37.5" class="actor" style="text-anchor: middle;">
<tspan x="475" y="28">local</tspan><tspan x="475" dy="24">repository</tspan></text></g>
<g><rect xmlns="http://www.w3.org/2000/svg" x="575" y="-20" fill="#efefef" width="200" height="2000"/><line x1="575" y1="-20" x2="575" y2="2000" stroke-width="1" stroke="black" style="stroke-dasharray: 2px, 2px; fill: none;"></line><line x1="675" y1="5" x2="675" y2="2000" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="600" y="0" fill="#ef604b" stroke="#666" width="150" height="65" rx="20" ry="20" class="actor"></rect>
<text x="675" y="37.5" class="actor" style="text-anchor: middle;">
<tspan x="675" y="28">remote</tspan><tspan x="675" dy="24">repository</tspan></text></g>
<defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs>
<defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0px, 0px;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0px, 0px;"></path></marker></defs>
<g><text x="540" y="93" class="messageText" style="text-anchor: middle;">clone</text><line x1="675" y1="100" x2="475" y2="100" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g>
<g transform="translate(0 -35)">
<g><!--<text x="275" y="128" class="messageText" style="text-anchor: middle;">clone</text>--><line x1="475" y1="135" x2="75" y2="135" class="messageLine1" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="stroke-dasharray: 3px, 3px; fill: none;"></line></g>
<g><text x="540" y="163" class="messageText" style="text-anchor: middle;">fetch</text><line x1="675" y1="170" x2="475" y2="170" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g>
<g transform="translate(0 12)"><text x="475" y="198" class="messageText" style="text-anchor: middle;" transform="translate(0 -3)">merge</text><path d="M 475,205 C 535,195 535,235 475,225" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></path><line x1="475" y1="225" x2="75" y2="225" class="messageLine1" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="stroke-dasharray: 3px, 3px; fill: none;"></line></g>
<g><text x="275" y="263" class="messageText" style="text-anchor: middle;">checkout</text><line x1="475" y1="270" x2="75" y2="270" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g>
<g><text x="175" y="298" class="messageText" style="text-anchor: middle;">add</text><line x1="75" y1="305" x2="275" y2="305" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g>
<g><text x="175" y="333" class="messageText" style="text-anchor: middle;">reset</text><line x1="275" y1="340" x2="75" y2="340" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g>
<g><text x="375" y="368" class="messageText" style="text-anchor: middle;">commit</text><line x1="275" y1="375" x2="475" y2="375" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g>
<g transform="translate(0 12)"><text x="475" y="403" class="messageText" style="text-anchor: middle;" transform="translate(0 -3)">rebase</text><path d="M 475,410 C 535,400 535,440 475,430" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></path><line x1="475" y1="430" x2="75" y2="430" class="messageLine1" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="stroke-dasharray: 3px, 3px; fill: none;"></line></g>
<g><text x="540" y="468" class="messageText" style="text-anchor: middle;">push</text><line x1="475" y1="475" x2="675" y2="475" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g></g></svg>

slides.pdf