Skip to content

Fig folder changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Dec 11, 2014
Merged

Fig folder changes #2

merged 3 commits into from
Dec 11, 2014

Conversation

efarsarakis
Copy link

  1. Moved unused images in /fig to /fig/extras.
  2. Corrected formatting of git-file-trees.png.

@archer-training
Moved unused figures to "extras" folder
e7edb1b 
1. Created a folder /fig/extras to contain all unused figures from the
/fig folder.
2. Moved unused figures to that folder
@archer-training
git-file-trees.png formatting correction
1773c9d 
Corrected image to be correctly entered and formatted.
@jiffyclub
Copy link
Contributor

Thanks for moving this over!

@gvwilson, what do you think of this? If we're not using files I'd rather delete them instead of putting them in a folder, but if we want to keep them so they can be used in the future do they need to go in a separate folder?

@efarsarakis
Copy link
Author

@jiffyclub I thought of deleting them too, but then figured that an archive of figures may also be useful to people who want to take a slightly different direction in their lesson.

@gvwilson
Copy link
Contributor

gvwilson commented Dec 8, 2014

I vote for deleting (since they'll still be in the Git history) - it's
already hard to keep track of all our stuff, and we can always look back
in the 'bc' repo for inspiration. But it's just one vote, and I'm happy
to abide by whatever you two think is best.

@efarsarakis
Copy link
Author

@jiffyclub @gvwilson I have committed changes which completely remove the unused figures in ./fig.

@jiffyclub
Copy link
Contributor

Thanks, looks good! @gvwilson, I actually don't have permission to merge PRs in this repo.

@gvwilson
Copy link
Contributor

Whoops - added the right team. And merged PR.

gvwilson pushed a commit that referenced this pull request Dec 11, 2014
Merge pull request #2 from efarsarakis/fig_folder_changes
cc9d566 
Fig folder changes
@gvwilson gvwilson merged commit cc9d566 into swcarpentry:gh-pages Dec 11, 2014
daisieh added a commit that referenced this pull request Apr 25, 2015
@daisieh
Merge pull request #2 from r-gaia-cs/new-images
ab0e1ac 
Address requests from @iglpdc to new images

diff --git a/04-history.html b/04-history.html
index 5d9c176..e3b9592 100644
--- a/04-history.html
+++ b/04-history.html
@@ -106,7 +106,11 @@ But the Mummy will appreciate the lack of humidity</code></pre>
 <img src="fig/git-checkout.svg" alt="Git Checkout" />
 <p class="caption">Git Checkout</p>
 </div>
-<p>So, to put it all together:</p>
+<p>The following diagram illustrates what the history of a file might look like (moving back from <code>HEAD</code>, the most recently committed version):</p>
+<div class="figure">
+<img src="fig/git-when-revisions-updated.svg" alt="When Git Updates Revision Numbers" />
+<p class="caption">When Git Updates Revision Numbers</p>
+</div>
 <div id="how-git-works-in-cartoon-form" class="callout panel panel-info">
 <div class="panel-heading">
 <h2 id="how-git-works-in-cartoon-form" class="callout panel panel-info"><span class="glyphicon glyphicon-pushpin"></span>How Git works, in cartoon form</h2>
diff --git a/fig/git-committing.svg b/fig/git-committing.svg
index 33172df..71b9dca 100644
--- a/fig/git-committing.svg
+++ b/fig/git-committing.svg
@@ -1,135 +1,436 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="622px"
-	 height="355px" viewBox="0 0 622 355" enable-background="new 0 0 622 355" xml:space="preserve">
-<g id="Layer_5">
-	<path fill="#B5B5B5" stroke="#FFFFFF" stroke-miterlimit="10" d="M610,23c0-8.284-6.716-15-15-15H210c-8.284,0-15,6.716-15,15v297
-		c0,8.284,6.716,15,15,15h385c8.284,0,15-6.716,15-15V23z"/>
-	<rect x="210" y="21" fill="none" width="70" height="28"/>
-	<text transform="matrix(1 0 0 1 210 33.4199)" font-family="'Consolas'" font-size="18">.git</text>
-</g>
-<g id="Layer_3">
-	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="331.499" y1="153" x2="331.499" y2="208.248">
-			<stop  offset="0.0982" style="stop-color:#C4C4C4"/>
-			<stop  offset="0.5326" style="stop-color:#686868"/>
-			<stop  offset="1" style="stop-color:#000000"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" stroke="#231F20" stroke-miterlimit="10" d="M281.453,207.219c0-9.264,22.404-16.777,50.047-16.777
-			s50.045,7.514,50.045,16.777v1.029c0,0,0-2.115,0-3.117c0-1.007,0-35.744,0-35.744v0.393c0-9.27-22.402-16.779-50.045-16.779
-			s-50.047,7.51-50.047,16.779v-0.393c0,0,0,34.519,0,35.732c0,1.205,0,3.129,0,3.129V207.219z"/>
-		<g>
-			<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M381.545,169.387c0,0,0,34.737,0,35.744
-				c0,1.002,0.355,3.117,0.355,3.117c0,9.27-22.758,16.779-50.4,16.779s-50.4-7.51-50.4-16.779c0,0,0.354-1.924,0.354-3.129
-				c0-1.214,0-35.732,0-35.732c0,9.273,22.404,16.784,50.047,16.784S381.545,178.66,381.545,169.387z"/>
-		</g>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="369.719,149.979 310.411,149.979 297.235,164.473
-			356.542,164.473 		"/>
-		<line fill="none" stroke="#70BF41" stroke-width="2" x1="310.411" y1="155.908" x2="359.165" y2="155.908"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="371.029,165.753 311.722,165.753 298.546,180.247
-			357.853,180.247 		"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="312.722" y1="169.683" x2="361.476" y2="169.683"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="308.722" y1="174.683" x2="357.476" y2="174.683"/>
-	</g>
-</g>
-<g id="Layer_4">
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="547.3916" y1="144.6602" x2="547.3916" y2="199.9121">
-		<stop  offset="0.0982" style="stop-color:#C4C4C4"/>
-		<stop  offset="0.5326" style="stop-color:#686868"/>
-		<stop  offset="1" style="stop-color:#000000"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" stroke="#231F20" stroke-miterlimit="10" d="M497.345,198.883c0-9.268,22.407-16.781,50.047-16.781
-		c27.641,0,50.047,7.514,50.047,16.781v1.029c0,0,0-2.117,0-3.12s0-35.739,0-35.739v0.389c0-9.268-22.406-16.781-50.047-16.781
-		c-27.64,0-50.047,7.514-50.047,16.781v-0.389c0,0,0,34.52,0,35.729s0,3.131,0,3.131V198.883z"/>
-	<g>
-		<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M597.235,238.283c0,0,0,34.738,0,35.74s0.354,3.121,0.354,3.121
-			c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.729,0-35.729
-			c0,9.268,22.407,16.781,50.047,16.781C574.829,255.064,597.235,247.551,597.235,238.283z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M597.235,199.602c0,0,0,34.736,0,35.738s0.354,3.121,0.354,3.121
-			c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.727,0-35.727
-			c0,9.268,22.407,16.779,50.047,16.779C574.829,216.381,597.235,208.869,597.235,199.602z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M597.235,160.629c0,0,0,34.736,0,35.738
-			c0,1.003,0.354,3.121,0.354,3.121c0,9.268-22.76,16.781-50.4,16.781c-27.64,0-50.399-7.514-50.399-16.781
-			c0,0,0.353-1.923,0.353-3.132s0-35.728,0-35.728c0,9.268,22.407,16.779,50.047,16.779
-			C574.829,177.408,597.235,169.896,597.235,160.629z"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="584.086,151.774 524.778,151.774 511.603,166.269
-			570.909,166.269 		"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="525.778" y1="155.704" x2="574.532" y2="155.704"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="521.778" y1="160.704" x2="570.532" y2="160.704"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="582.775,136 523.468,136 510.292,150.494
-			569.599,150.494 		"/>
-		<line fill="none" stroke="#70BF41" stroke-width="2" x1="523.468" y1="141.93" x2="572.222" y2="141.93"/>
-	</g>
-</g>
-<g id="Layer_1">
-	<g>
-		<rect x="24" y="22" fill="#DCDEE0" width="100" height="128"/>
-		<rect x="24" y="22" fill="none" stroke="#85888D" stroke-width="2" width="100" height="128"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="42" x2="111" y2="42"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="48" x2="111" y2="48"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="54" x2="111" y2="54"/>
-		<line fill="none" stroke="#70BF41" stroke-width="2" x1="37" y1="66" x2="111" y2="66"/>
-	</g>
-	<rect x="27.628" y="136" fill="none" width="92.743" height="14"/>
-	<text transform="matrix(1 0 0 1 44.3105 144.2803)" font-family="'Consolas'" font-size="12">FILE1.txt</text>
-	<g>
-		<rect x="24" y="203" fill="#DCDEE0" width="100" height="128"/>
-		<rect x="24" y="203" fill="none" stroke="#85888D" stroke-width="2" width="100" height="128"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="223" x2="111" y2="223"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="229" x2="111" y2="229"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="235" x2="111" y2="235"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="264.514" x2="111" y2="264.514"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="270.514" x2="111" y2="270.514"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="276.514" x2="111" y2="276.514"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="37" y1="247" x2="111" y2="247"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="37" y1="253" x2="111" y2="253"/>
-		<rect x="27.628" y="317" fill="none" width="92.743" height="14"/>
-		<text transform="matrix(1 0 0 1 44.3105 325.2803)" font-family="'Consolas'" font-size="12">FILE2.txt</text>
-	</g>
-</g>
-<g id="Layer_2">
-	<g>
-		<g>
-
-				<rect x="142.095" y="96.681" transform="matrix(0.9253 0.3793 -0.3793 0.9253 56.6822 -63.7296)" fill="#45BEEE" width="95.956" height="30.604"/>
-			<polygon fill="#45BEEE" points="242.925,100.688 220.118,156.32 269.223,143.451 			"/>
-		</g>
-
-			<rect x="143.039" y="112.134" transform="matrix(0.9253 0.3793 -0.3793 0.9253 60.6383 -67.6153)" fill="none" width="117.744" height="15.888"/>
-		<text transform="matrix(0.9253 0.3793 -0.3793 0.9253 149.894 99.1147)" font-family="'Consolas'" font-size="12">git add FILE1.txt</text>
-	</g>
-	<g>
-		<g>
-
-				<rect x="144.116" y="216.684" transform="matrix(0.9276 -0.3736 0.3736 0.9276 -72.76 88.5639)" fill="#45BEEE" width="95.955" height="30.604"/>
-			<polygon fill="#45BEEE" points="222.087,187.027 244.55,242.798 270.759,199.325 			"/>
-		</g>
-
-			<rect x="147.351" y="221.583" transform="matrix(0.9276 -0.3736 0.3736 0.9276 -70.8178 93.6628)" fill="none" width="117.744" height="15.888"/>
-		<text transform="matrix(0.9276 -0.3736 0.3736 0.9276 154.3267 250.7891)" font-family="'Consolas'" font-size="12">git add FILE2.txt</text>
-	</g>
-	<g>
-		<rect x="399.466" y="173.768" fill="#45BEEE" width="45.956" height="30.604"/>
-		<polygon fill="#45BEEE" points="442.062,158.571 442.062,218.695 482.614,188.163 		"/>
-	</g>
-	<rect x="395.195" y="183.069" fill="none" width="85.542" height="14"/>
-	<text transform="matrix(1 0 0 1 404.9785 191.3496)" font-family="'Consolas'" font-size="12">git commit</text>
-	<rect x="257" y="235.014" fill="none" width="147" height="17"/>
-	<text transform="matrix(1 0 0 1 297.4766 243.6416)" font-family="'Helvetica'" font-size="12">staging area</text>
-	<rect x="475" y="306" fill="none" width="147" height="17"/>
-	<text transform="matrix(1 0 0 1 522.1562 314.6279)" font-family="'Helvetica'" font-size="12">repository</text>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="622px"
+   height="355px"
+   viewBox="0 0 622 355"
+   enable-background="new 0 0 622 355"
+   xml:space="preserve"
+   id="svg9213"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="git-committing.svg"><metadata
+     id="metadata9380"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs9378" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1362"
+     inkscape:window-height="729"
+     id="namedview9376"
+     showgrid="true"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="263.10188"
+     inkscape:cy="144.9646"
+     inkscape:window-x="0"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg9213"><inkscape:grid
+       type="xygrid"
+       id="grid9429" /></sodipodi:namedview><g
+     id="Layer_5"><path
+       fill="#B5B5B5"
+       stroke="#FFFFFF"
+       stroke-miterlimit="10"
+       d="M610,23c0-8.284-6.716-15-15-15H210c-8.284,0-15,6.716-15,15v297   c0,8.284,6.716,15,15,15h385c8.284,0,15-6.716,15-15V23z"
+       id="path9216" /><rect
+       x="210"
+       y="21"
+       fill="none"
+       width="70"
+       height="28"
+       id="rect9218" /><text
+       transform="matrix(1 0 0 1 210 33.4199)"
+       font-family="'Consolas'"
+       font-size="18"
+       id="text9220">.git</text>
+</g><g
+     id="Layer_3"><g
+       id="g9223"><linearGradient
+         id="SVGID_1_"
+         gradientUnits="userSpaceOnUse"
+         x1="331.499"
+         y1="153"
+         x2="331.499"
+         y2="208.248"><stop
+           offset="0.0982"
+           style="stop-color:#C4C4C4"
+           id="stop9226" /><stop
+           offset="0.5326"
+           style="stop-color:#686868"
+           id="stop9228" /><stop
+           offset="1"
+           style="stop-color:#000000"
+           id="stop9230" /></linearGradient><path
+         fill="url(#SVGID_1_)"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M281.453,207.219c0-9.264,22.404-16.777,50.047-16.777    s50.045,7.514,50.045,16.777v1.029c0,0,0-2.115,0-3.117c0-1.007,0-35.744,0-35.744v0.393c0-9.27-22.402-16.779-50.045-16.779    s-50.047,7.51-50.047,16.779v-0.393c0,0,0,34.519,0,35.732c0,1.205,0,3.129,0,3.129V207.219z"
+         id="path9232" /><g
+         id="g9234"><path
+           fill="#FFFFFF"
+           stroke="#231F20"
+           stroke-miterlimit="10"
+           d="M381.545,169.387c0,0,0,34.737,0,35.744     c0,1.002,0.355,3.117,0.355,3.117c0,9.27-22.758,16.779-50.4,16.779s-50.4-7.51-50.4-16.779c0,0,0.354-1.924,0.354-3.129     c0-1.214,0-35.732,0-35.732c0,9.273,22.404,16.784,50.047,16.784S381.545,178.66,381.545,169.387z"
+           id="path9236" /></g></g><g
+       id="g9238"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="369.719,149.979 310.411,149.979 297.235,164.473     356.542,164.473   "
+         id="polygon9240" /><line
+         fill="none"
+         stroke="#70BF41"
+         stroke-width="2"
+         x1="310.411"
+         y1="155.908"
+         x2="359.165"
+         y2="155.908"
+         id="line9242" /></g><g
+       id="g9244"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="371.029,165.753 311.722,165.753 298.546,180.247     357.853,180.247   "
+         id="polygon9246" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="312.722"
+         y1="169.683"
+         x2="361.476"
+         y2="169.683"
+         id="line9248" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="308.722"
+         y1="174.683"
+         x2="357.476"
+         y2="174.683"
+         id="line9250" /></g></g><g
+     id="Layer_4"><linearGradient
+       id="SVGID_2_"
+       gradientUnits="userSpaceOnUse"
+       x1="547.3916"
+       y1="144.6602"
+       x2="547.3916"
+       y2="199.9121"><stop
+         offset="0.0982"
+         style="stop-color:#C4C4C4"
+         id="stop9254" /><stop
+         offset="0.5326"
+         style="stop-color:#686868"
+         id="stop9256" /><stop
+         offset="1"
+         style="stop-color:#000000"
+         id="stop9258" /></linearGradient><path
+       fill="url(#SVGID_2_)"
+       stroke="#231F20"
+       stroke-miterlimit="10"
+       d="M497.345,198.883c0-9.268,22.407-16.781,50.047-16.781   c27.641,0,50.047,7.514,50.047,16.781v1.029c0,0,0-2.117,0-3.12s0-35.739,0-35.739v0.389c0-9.268-22.406-16.781-50.047-16.781   c-27.64,0-50.047,7.514-50.047,16.781v-0.389c0,0,0,34.52,0,35.729s0,3.131,0,3.131V198.883z"
+       id="path9260" /><g
+       id="g9262"><path
+         fill="#FFFFFF"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M597.235,238.283c0,0,0,34.738,0,35.74s0.354,3.121,0.354,3.121    c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.729,0-35.729    c0,9.268,22.407,16.781,50.047,16.781C574.829,255.064,597.235,247.551,597.235,238.283z"
+         id="path9264" /></g><g
+       id="g9266"><path
+         fill="#FFFFFF"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M597.235,199.602c0,0,0,34.736,0,35.738s0.354,3.121,0.354,3.121    c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.727,0-35.727    c0,9.268,22.407,16.779,50.047,16.779C574.829,216.381,597.235,208.869,597.235,199.602z"
+         id="path9268" /></g><g
+       id="g9270"><path
+         fill="#FFFFFF"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M597.235,160.629c0,0,0,34.736,0,35.738    c0,1.003,0.354,3.121,0.354,3.121c0,9.268-22.76,16.781-50.4,16.781c-27.64,0-50.399-7.514-50.399-16.781    c0,0,0.353-1.923,0.353-3.132s0-35.728,0-35.728c0,9.268,22.407,16.779,50.047,16.779    C574.829,177.408,597.235,169.896,597.235,160.629z"
+         id="path9272" /></g><g
+       id="g9274"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="584.086,151.774 524.778,151.774 511.603,166.269     570.909,166.269   "
+         id="polygon9276" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="525.778"
+         y1="155.704"
+         x2="574.532"
+         y2="155.704"
+         id="line9278" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="521.778"
+         y1="160.704"
+         x2="570.532"
+         y2="160.704"
+         id="line9280" /></g><g
+       id="g9282"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="582.775,136 523.468,136 510.292,150.494     569.599,150.494   "
+         id="polygon9284" /><line
+         fill="none"
+         stroke="#70BF41"
+         stroke-width="2"
+         x1="523.468"
+         y1="141.93"
+         x2="572.222"
+         y2="141.93"
+         id="line9286" /></g></g><g
+     id="Layer_1"><g
+       id="g9289"><rect
+         x="24"
+         y="22"
+         fill="#DCDEE0"
+         width="100"
+         height="128"
+         id="rect9291" /><rect
+         x="24"
+         y="22"
+         fill="none"
+         stroke="#85888D"
+         stroke-width="2"
+         width="100"
+         height="128"
+         id="rect9293" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="42"
+         x2="111"
+         y2="42"
+         id="line9295" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="48"
+         x2="111"
+         y2="48"
+         id="line9297" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="54"
+         x2="111"
+         y2="54"
+         id="line9299" /><line
+         fill="none"
+         stroke="#70BF41"
+         stroke-width="2"
+         x1="37"
+         y1="66"
+         x2="111"
+         y2="66"
+         id="line9301" /></g><rect
+       x="27.628"
+       y="136"
+       fill="none"
+       width="92.743"
+       height="14"
+       id="rect9303" /><text
+       transform="matrix(1 0 0 1 44.3105 144.2803)"
+       font-family="'Consolas'"
+       font-size="12"
+       id="text9305">FILE1.txt</text>
+<g
+       id="g9307"><rect
+         x="24"
+         y="203"
+         fill="#DCDEE0"
+         width="100"
+         height="128"
+         id="rect9309" /><rect
+         x="24"
+         y="203"
+         fill="none"
+         stroke="#85888D"
+         stroke-width="2"
+         width="100"
+         height="128"
+         id="rect9311" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="223"
+         x2="111"
+         y2="223"
+         id="line9313" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="229"
+         x2="111"
+         y2="229"
+         id="line9315" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="235"
+         x2="111"
+         y2="235"
+         id="line9317" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="264.514"
+         x2="111"
+         y2="264.514"
+         id="line9319" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="270.514"
+         x2="111"
+         y2="270.514"
+         id="line9321" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="276.514"
+         x2="111"
+         y2="276.514"
+         id="line9323" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="37"
+         y1="247"
+         x2="111"
+         y2="247"
+         id="line9325" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="37"
+         y1="253"
+         x2="111"
+         y2="253"
+         id="line9327" /><rect
+         x="27.628"
+         y="317"
+         fill="none"
+         width="92.743"
+         height="14"
+         id="rect9329" /><text
+         transform="matrix(1 0 0 1 44.3105 325.2803)"
+         font-family="'Consolas'"
+         font-size="12"
+         id="text9331">FILE2.txt</text>
+</g></g><rect
+     style="fill:none"
+     id="rect9364"
+     height="14"
+     width="85.542"
+     y="183.069"
+     x="395.19501" /><g
+     id="g9403"><g
+       id="g9358"><rect
+         x="399.466"
+         y="173.76801"
+         width="45.956001"
+         height="30.604"
+         id="rect9360"
+         style="fill:#45beee" /><polygon
+         points="482.614,188.163 442.062,158.571 442.062,218.695 "
+         id="polygon9362"
+         style="fill:#45beee" /></g><text
+       y="191.34959"
+       x="404.97849"
+       font-size="12"
+       id="text9366"
+       style="font-size:12px;font-family:Consolas">git commit</text>
+</g><rect
+     style="fill:none"
+     id="rect9368"
+     height="17"
+     width="147"
+     y="235.01401"
+     x="257" /><text
+     style="font-size:12px;font-family:Helvetica"
+     id="text9370"
+     font-size="12"
+     x="297.47659"
+     y="243.6416">staging area</text>
+<rect
+     style="fill:none"
+     id="rect9372"
+     height="17"
+     width="147"
+     y="306"
+     x="475" /><text
+     style="font-size:12px;font-family:Helvetica"
+     id="text9374"
+     font-size="12"
+     x="522.15619"
+     y="314.6279">repository</text>
+<g
+     id="g9437"><g
+       transform="translate(-212.84669,28.971837)"
+       id="g9411"><rect
+         style="fill:#45beee"
+         id="rect9413"
+         height="30.604004"
+         width="88.57531"
+         y="173.76801"
+         x="356.84668" /><polygon
+         style="fill:#45beee"
+         id="polygon9415"
+         points="442.062,218.695 482.614,188.163 442.062,158.571 " /></g><text
+       style="font-size:12px;font-family:Consolas"
+       id="text9417"
+       font-size="12"
+       x="148.13179"
+       y="220.32143">git add FILE2.txt</text>
+</g><g
+     id="g9443"
+     transform="translate(0,-82)"><g
+       id="g9445"
+       transform="translate(-212.84669,28.971837)"><rect
+         x="356.84668"
+         y="173.76801"
+         width="88.57531"
+         height="30.604004"
+         id="rect9447"
+         style="fill:#45beee" /><polygon
+         points="442.062,158.571 442.062,218.695 482.614,188.163 "
+         id="polygon9449"
+         style="fill:#45beee" /></g><text
+       y="220.32143"
+       x="148.13179"
+       font-size="12"
+       id="text9451"
+       style="font-size:12px;font-family:Consolas">git add FILE1.txt</text>
+</g></svg>
\ No newline at end of file
diff --git a/fig/github-collaboration.svg b/fig/github-collaboration.svg
index 7aaab3f..2e79e17 100644
--- a/fig/github-collaboration.svg
+++ b/fig/github-collaboration.svg
@@ -23,7 +23,7 @@
    sodipodi:docname="github-collaboration.svg"><metadata
      id="metadata4778"><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><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs4776"><linearGradient
        y2="363.47269"
        x2="480.35739"
@@ -89,8 +89,8 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="768"
+     inkscape:window-width="1362"
+     inkscape:window-height="729"
      id="namedview4774"
      showgrid="false"
      showguides="true"
@@ -100,9 +100,9 @@
      fit-margin-bottom="0"
      inkscape:zoom="0.83382282"
      inkscape:cx="402.0795"
-     inkscape:cy="334.63872"
+     inkscape:cy="430.58236"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg4593" /><text
      xml:space="preserve"
@@ -542,7 +542,7 @@
                id="tspan10478"
                font-size="10.8"
                y="21.6"
-               x="0">origin https://github.com/wolfman/planets.git</tspan></text>
+               x="0">origin https://github.com/vlad/planets.git</tspan></text>
 </g><rect
            style="fill:none"
            id="rect10480"
pshriwise pushed a commit to pshriwise/git-novice that referenced this pull request Aug 8, 2017
@gonuke
Merge pull request swcarpentry#2 from andypohl/gh-pages
2ae21e0 
Added notes about the license for the borrowed code.
dlstrong referenced this pull request in dlstrong/git-novice Jun 10, 2018
@biologyguy
Merge pull request #2 from anelda/anelda-episodePushPull
c4484a7 
Added updates to Push/Pull episode
maxim-belkin pushed a commit to maxim-belkin/git-novice that referenced this pull request Oct 31, 2019
@dlstrong
Merge pull request swcarpentry#2 from maxim-belkin/fix-denas-repo
a1ea8ef 
.gitignore: sync up with the upstream
fmichonneau pushed a commit to fmichonneau/git-novice that referenced this pull request Jul 1, 2021
@ErinBecker
Merge pull request swcarpentry#2 from orchid00/patch-1
6e6f4f3 
Update CONDUCT.md
fmichonneau added a commit to fmichonneau/git-novice that referenced this pull request Jul 1, 2021
@fmichonneau
Merge pull request swcarpentry#2 from fmichonneau/latest-style
84943b9 
Bring in latest changes to styles repository
zkamvar pushed a commit that referenced this pull request May 8, 2023
Merge pull request #2 from gvwilson/gh-pages
0b301d2 
Adding a note to remind authors to say what learners are supposed to do in lessons.
zkamvar pushed a commit that referenced this pull request May 8, 2023
Merge pull request #2 from efarsarakis/fig_folder_changes
913c232 
Fig folder changes
zkamvar pushed a commit that referenced this pull request May 8, 2023
@daisieh
Merge pull request #2 from r-gaia-cs/new-images
d6dd1de 
Address requests from @iglpdc to new images

diff --git a/04-history.html b/04-history.html
index 5d9c176..e3b9592 100644
--- a/04-history.html
+++ b/04-history.html
@@ -106,7 +106,11 @@ But the Mummy will appreciate the lack of humidity</code></pre>
 <img src="fig/git-checkout.svg" alt="Git Checkout" />
 <p class="caption">Git Checkout</p>
 </div>
-<p>So, to put it all together:</p>
+<p>The following diagram illustrates what the history of a file might look like (moving back from <code>HEAD</code>, the most recently committed version):</p>
+<div class="figure">
+<img src="fig/git-when-revisions-updated.svg" alt="When Git Updates Revision Numbers" />
+<p class="caption">When Git Updates Revision Numbers</p>
+</div>
 <div id="how-git-works-in-cartoon-form" class="callout panel panel-info">
 <div class="panel-heading">
 <h2 id="how-git-works-in-cartoon-form" class="callout panel panel-info"><span class="glyphicon glyphicon-pushpin"></span>How Git works, in cartoon form</h2>
diff --git a/fig/git-committing.svg b/fig/git-committing.svg
index 33172df..71b9dca 100644
--- a/fig/git-committing.svg
+++ b/fig/git-committing.svg
@@ -1,135 +1,436 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="622px"
-	 height="355px" viewBox="0 0 622 355" enable-background="new 0 0 622 355" xml:space="preserve">
-<g id="Layer_5">
-	<path fill="#B5B5B5" stroke="#FFFFFF" stroke-miterlimit="10" d="M610,23c0-8.284-6.716-15-15-15H210c-8.284,0-15,6.716-15,15v297
-		c0,8.284,6.716,15,15,15h385c8.284,0,15-6.716,15-15V23z"/>
-	<rect x="210" y="21" fill="none" width="70" height="28"/>
-	<text transform="matrix(1 0 0 1 210 33.4199)" font-family="'Consolas'" font-size="18">.git</text>
-</g>
-<g id="Layer_3">
-	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="331.499" y1="153" x2="331.499" y2="208.248">
-			<stop  offset="0.0982" style="stop-color:#C4C4C4"/>
-			<stop  offset="0.5326" style="stop-color:#686868"/>
-			<stop  offset="1" style="stop-color:#000000"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" stroke="#231F20" stroke-miterlimit="10" d="M281.453,207.219c0-9.264,22.404-16.777,50.047-16.777
-			s50.045,7.514,50.045,16.777v1.029c0,0,0-2.115,0-3.117c0-1.007,0-35.744,0-35.744v0.393c0-9.27-22.402-16.779-50.045-16.779
-			s-50.047,7.51-50.047,16.779v-0.393c0,0,0,34.519,0,35.732c0,1.205,0,3.129,0,3.129V207.219z"/>
-		<g>
-			<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M381.545,169.387c0,0,0,34.737,0,35.744
-				c0,1.002,0.355,3.117,0.355,3.117c0,9.27-22.758,16.779-50.4,16.779s-50.4-7.51-50.4-16.779c0,0,0.354-1.924,0.354-3.129
-				c0-1.214,0-35.732,0-35.732c0,9.273,22.404,16.784,50.047,16.784S381.545,178.66,381.545,169.387z"/>
-		</g>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="369.719,149.979 310.411,149.979 297.235,164.473
-			356.542,164.473 		"/>
-		<line fill="none" stroke="#70BF41" stroke-width="2" x1="310.411" y1="155.908" x2="359.165" y2="155.908"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="371.029,165.753 311.722,165.753 298.546,180.247
-			357.853,180.247 		"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="312.722" y1="169.683" x2="361.476" y2="169.683"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="308.722" y1="174.683" x2="357.476" y2="174.683"/>
-	</g>
-</g>
-<g id="Layer_4">
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="547.3916" y1="144.6602" x2="547.3916" y2="199.9121">
-		<stop  offset="0.0982" style="stop-color:#C4C4C4"/>
-		<stop  offset="0.5326" style="stop-color:#686868"/>
-		<stop  offset="1" style="stop-color:#000000"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" stroke="#231F20" stroke-miterlimit="10" d="M497.345,198.883c0-9.268,22.407-16.781,50.047-16.781
-		c27.641,0,50.047,7.514,50.047,16.781v1.029c0,0,0-2.117,0-3.12s0-35.739,0-35.739v0.389c0-9.268-22.406-16.781-50.047-16.781
-		c-27.64,0-50.047,7.514-50.047,16.781v-0.389c0,0,0,34.52,0,35.729s0,3.131,0,3.131V198.883z"/>
-	<g>
-		<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M597.235,238.283c0,0,0,34.738,0,35.74s0.354,3.121,0.354,3.121
-			c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.729,0-35.729
-			c0,9.268,22.407,16.781,50.047,16.781C574.829,255.064,597.235,247.551,597.235,238.283z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M597.235,199.602c0,0,0,34.736,0,35.738s0.354,3.121,0.354,3.121
-			c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.727,0-35.727
-			c0,9.268,22.407,16.779,50.047,16.779C574.829,216.381,597.235,208.869,597.235,199.602z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" stroke="#231F20" stroke-miterlimit="10" d="M597.235,160.629c0,0,0,34.736,0,35.738
-			c0,1.003,0.354,3.121,0.354,3.121c0,9.268-22.76,16.781-50.4,16.781c-27.64,0-50.399-7.514-50.399-16.781
-			c0,0,0.353-1.923,0.353-3.132s0-35.728,0-35.728c0,9.268,22.407,16.779,50.047,16.779
-			C574.829,177.408,597.235,169.896,597.235,160.629z"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="584.086,151.774 524.778,151.774 511.603,166.269
-			570.909,166.269 		"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="525.778" y1="155.704" x2="574.532" y2="155.704"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="521.778" y1="160.704" x2="570.532" y2="160.704"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" points="582.775,136 523.468,136 510.292,150.494
-			569.599,150.494 		"/>
-		<line fill="none" stroke="#70BF41" stroke-width="2" x1="523.468" y1="141.93" x2="572.222" y2="141.93"/>
-	</g>
-</g>
-<g id="Layer_1">
-	<g>
-		<rect x="24" y="22" fill="#DCDEE0" width="100" height="128"/>
-		<rect x="24" y="22" fill="none" stroke="#85888D" stroke-width="2" width="100" height="128"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="42" x2="111" y2="42"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="48" x2="111" y2="48"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="54" x2="111" y2="54"/>
-		<line fill="none" stroke="#70BF41" stroke-width="2" x1="37" y1="66" x2="111" y2="66"/>
-	</g>
-	<rect x="27.628" y="136" fill="none" width="92.743" height="14"/>
-	<text transform="matrix(1 0 0 1 44.3105 144.2803)" font-family="'Consolas'" font-size="12">FILE1.txt</text>
-	<g>
-		<rect x="24" y="203" fill="#DCDEE0" width="100" height="128"/>
-		<rect x="24" y="203" fill="none" stroke="#85888D" stroke-width="2" width="100" height="128"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="223" x2="111" y2="223"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="229" x2="111" y2="229"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="235" x2="111" y2="235"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="264.514" x2="111" y2="264.514"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="270.514" x2="111" y2="270.514"/>
-		<line fill="none" stroke="#000000" stroke-width="2" x1="37" y1="276.514" x2="111" y2="276.514"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="37" y1="247" x2="111" y2="247"/>
-		<line fill="none" stroke="#B285BC" stroke-width="2" x1="37" y1="253" x2="111" y2="253"/>
-		<rect x="27.628" y="317" fill="none" width="92.743" height="14"/>
-		<text transform="matrix(1 0 0 1 44.3105 325.2803)" font-family="'Consolas'" font-size="12">FILE2.txt</text>
-	</g>
-</g>
-<g id="Layer_2">
-	<g>
-		<g>
-
-				<rect x="142.095" y="96.681" transform="matrix(0.9253 0.3793 -0.3793 0.9253 56.6822 -63.7296)" fill="#45BEEE" width="95.956" height="30.604"/>
-			<polygon fill="#45BEEE" points="242.925,100.688 220.118,156.32 269.223,143.451 			"/>
-		</g>
-
-			<rect x="143.039" y="112.134" transform="matrix(0.9253 0.3793 -0.3793 0.9253 60.6383 -67.6153)" fill="none" width="117.744" height="15.888"/>
-		<text transform="matrix(0.9253 0.3793 -0.3793 0.9253 149.894 99.1147)" font-family="'Consolas'" font-size="12">git add FILE1.txt</text>
-	</g>
-	<g>
-		<g>
-
-				<rect x="144.116" y="216.684" transform="matrix(0.9276 -0.3736 0.3736 0.9276 -72.76 88.5639)" fill="#45BEEE" width="95.955" height="30.604"/>
-			<polygon fill="#45BEEE" points="222.087,187.027 244.55,242.798 270.759,199.325 			"/>
-		</g>
-
-			<rect x="147.351" y="221.583" transform="matrix(0.9276 -0.3736 0.3736 0.9276 -70.8178 93.6628)" fill="none" width="117.744" height="15.888"/>
-		<text transform="matrix(0.9276 -0.3736 0.3736 0.9276 154.3267 250.7891)" font-family="'Consolas'" font-size="12">git add FILE2.txt</text>
-	</g>
-	<g>
-		<rect x="399.466" y="173.768" fill="#45BEEE" width="45.956" height="30.604"/>
-		<polygon fill="#45BEEE" points="442.062,158.571 442.062,218.695 482.614,188.163 		"/>
-	</g>
-	<rect x="395.195" y="183.069" fill="none" width="85.542" height="14"/>
-	<text transform="matrix(1 0 0 1 404.9785 191.3496)" font-family="'Consolas'" font-size="12">git commit</text>
-	<rect x="257" y="235.014" fill="none" width="147" height="17"/>
-	<text transform="matrix(1 0 0 1 297.4766 243.6416)" font-family="'Helvetica'" font-size="12">staging area</text>
-	<rect x="475" y="306" fill="none" width="147" height="17"/>
-	<text transform="matrix(1 0 0 1 522.1562 314.6279)" font-family="'Helvetica'" font-size="12">repository</text>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="622px"
+   height="355px"
+   viewBox="0 0 622 355"
+   enable-background="new 0 0 622 355"
+   xml:space="preserve"
+   id="svg9213"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="git-committing.svg"><metadata
+     id="metadata9380"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs9378" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1362"
+     inkscape:window-height="729"
+     id="namedview9376"
+     showgrid="true"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="263.10188"
+     inkscape:cy="144.9646"
+     inkscape:window-x="0"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg9213"><inkscape:grid
+       type="xygrid"
+       id="grid9429" /></sodipodi:namedview><g
+     id="Layer_5"><path
+       fill="#B5B5B5"
+       stroke="#FFFFFF"
+       stroke-miterlimit="10"
+       d="M610,23c0-8.284-6.716-15-15-15H210c-8.284,0-15,6.716-15,15v297   c0,8.284,6.716,15,15,15h385c8.284,0,15-6.716,15-15V23z"
+       id="path9216" /><rect
+       x="210"
+       y="21"
+       fill="none"
+       width="70"
+       height="28"
+       id="rect9218" /><text
+       transform="matrix(1 0 0 1 210 33.4199)"
+       font-family="'Consolas'"
+       font-size="18"
+       id="text9220">.git</text>
+</g><g
+     id="Layer_3"><g
+       id="g9223"><linearGradient
+         id="SVGID_1_"
+         gradientUnits="userSpaceOnUse"
+         x1="331.499"
+         y1="153"
+         x2="331.499"
+         y2="208.248"><stop
+           offset="0.0982"
+           style="stop-color:#C4C4C4"
+           id="stop9226" /><stop
+           offset="0.5326"
+           style="stop-color:#686868"
+           id="stop9228" /><stop
+           offset="1"
+           style="stop-color:#000000"
+           id="stop9230" /></linearGradient><path
+         fill="url(#SVGID_1_)"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M281.453,207.219c0-9.264,22.404-16.777,50.047-16.777    s50.045,7.514,50.045,16.777v1.029c0,0,0-2.115,0-3.117c0-1.007,0-35.744,0-35.744v0.393c0-9.27-22.402-16.779-50.045-16.779    s-50.047,7.51-50.047,16.779v-0.393c0,0,0,34.519,0,35.732c0,1.205,0,3.129,0,3.129V207.219z"
+         id="path9232" /><g
+         id="g9234"><path
+           fill="#FFFFFF"
+           stroke="#231F20"
+           stroke-miterlimit="10"
+           d="M381.545,169.387c0,0,0,34.737,0,35.744     c0,1.002,0.355,3.117,0.355,3.117c0,9.27-22.758,16.779-50.4,16.779s-50.4-7.51-50.4-16.779c0,0,0.354-1.924,0.354-3.129     c0-1.214,0-35.732,0-35.732c0,9.273,22.404,16.784,50.047,16.784S381.545,178.66,381.545,169.387z"
+           id="path9236" /></g></g><g
+       id="g9238"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="369.719,149.979 310.411,149.979 297.235,164.473     356.542,164.473   "
+         id="polygon9240" /><line
+         fill="none"
+         stroke="#70BF41"
+         stroke-width="2"
+         x1="310.411"
+         y1="155.908"
+         x2="359.165"
+         y2="155.908"
+         id="line9242" /></g><g
+       id="g9244"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="371.029,165.753 311.722,165.753 298.546,180.247     357.853,180.247   "
+         id="polygon9246" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="312.722"
+         y1="169.683"
+         x2="361.476"
+         y2="169.683"
+         id="line9248" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="308.722"
+         y1="174.683"
+         x2="357.476"
+         y2="174.683"
+         id="line9250" /></g></g><g
+     id="Layer_4"><linearGradient
+       id="SVGID_2_"
+       gradientUnits="userSpaceOnUse"
+       x1="547.3916"
+       y1="144.6602"
+       x2="547.3916"
+       y2="199.9121"><stop
+         offset="0.0982"
+         style="stop-color:#C4C4C4"
+         id="stop9254" /><stop
+         offset="0.5326"
+         style="stop-color:#686868"
+         id="stop9256" /><stop
+         offset="1"
+         style="stop-color:#000000"
+         id="stop9258" /></linearGradient><path
+       fill="url(#SVGID_2_)"
+       stroke="#231F20"
+       stroke-miterlimit="10"
+       d="M497.345,198.883c0-9.268,22.407-16.781,50.047-16.781   c27.641,0,50.047,7.514,50.047,16.781v1.029c0,0,0-2.117,0-3.12s0-35.739,0-35.739v0.389c0-9.268-22.406-16.781-50.047-16.781   c-27.64,0-50.047,7.514-50.047,16.781v-0.389c0,0,0,34.52,0,35.729s0,3.131,0,3.131V198.883z"
+       id="path9260" /><g
+       id="g9262"><path
+         fill="#FFFFFF"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M597.235,238.283c0,0,0,34.738,0,35.74s0.354,3.121,0.354,3.121    c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.729,0-35.729    c0,9.268,22.407,16.781,50.047,16.781C574.829,255.064,597.235,247.551,597.235,238.283z"
+         id="path9264" /></g><g
+       id="g9266"><path
+         fill="#FFFFFF"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M597.235,199.602c0,0,0,34.736,0,35.738s0.354,3.121,0.354,3.121    c0,9.268-22.76,16.779-50.4,16.779c-27.64,0-50.399-7.512-50.399-16.779c0,0,0.353-1.924,0.353-3.133s0-35.727,0-35.727    c0,9.268,22.407,16.779,50.047,16.779C574.829,216.381,597.235,208.869,597.235,199.602z"
+         id="path9268" /></g><g
+       id="g9270"><path
+         fill="#FFFFFF"
+         stroke="#231F20"
+         stroke-miterlimit="10"
+         d="M597.235,160.629c0,0,0,34.736,0,35.738    c0,1.003,0.354,3.121,0.354,3.121c0,9.268-22.76,16.781-50.4,16.781c-27.64,0-50.399-7.514-50.399-16.781    c0,0,0.353-1.923,0.353-3.132s0-35.728,0-35.728c0,9.268,22.407,16.779,50.047,16.779    C574.829,177.408,597.235,169.896,597.235,160.629z"
+         id="path9272" /></g><g
+       id="g9274"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="584.086,151.774 524.778,151.774 511.603,166.269     570.909,166.269   "
+         id="polygon9276" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="525.778"
+         y1="155.704"
+         x2="574.532"
+         y2="155.704"
+         id="line9278" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="521.778"
+         y1="160.704"
+         x2="570.532"
+         y2="160.704"
+         id="line9280" /></g><g
+       id="g9282"><polygon
+         fill="#FFFFFF"
+         stroke="#000000"
+         stroke-miterlimit="10"
+         points="582.775,136 523.468,136 510.292,150.494     569.599,150.494   "
+         id="polygon9284" /><line
+         fill="none"
+         stroke="#70BF41"
+         stroke-width="2"
+         x1="523.468"
+         y1="141.93"
+         x2="572.222"
+         y2="141.93"
+         id="line9286" /></g></g><g
+     id="Layer_1"><g
+       id="g9289"><rect
+         x="24"
+         y="22"
+         fill="#DCDEE0"
+         width="100"
+         height="128"
+         id="rect9291" /><rect
+         x="24"
+         y="22"
+         fill="none"
+         stroke="#85888D"
+         stroke-width="2"
+         width="100"
+         height="128"
+         id="rect9293" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="42"
+         x2="111"
+         y2="42"
+         id="line9295" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="48"
+         x2="111"
+         y2="48"
+         id="line9297" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="54"
+         x2="111"
+         y2="54"
+         id="line9299" /><line
+         fill="none"
+         stroke="#70BF41"
+         stroke-width="2"
+         x1="37"
+         y1="66"
+         x2="111"
+         y2="66"
+         id="line9301" /></g><rect
+       x="27.628"
+       y="136"
+       fill="none"
+       width="92.743"
+       height="14"
+       id="rect9303" /><text
+       transform="matrix(1 0 0 1 44.3105 144.2803)"
+       font-family="'Consolas'"
+       font-size="12"
+       id="text9305">FILE1.txt</text>
+<g
+       id="g9307"><rect
+         x="24"
+         y="203"
+         fill="#DCDEE0"
+         width="100"
+         height="128"
+         id="rect9309" /><rect
+         x="24"
+         y="203"
+         fill="none"
+         stroke="#85888D"
+         stroke-width="2"
+         width="100"
+         height="128"
+         id="rect9311" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="223"
+         x2="111"
+         y2="223"
+         id="line9313" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="229"
+         x2="111"
+         y2="229"
+         id="line9315" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="235"
+         x2="111"
+         y2="235"
+         id="line9317" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="264.514"
+         x2="111"
+         y2="264.514"
+         id="line9319" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="270.514"
+         x2="111"
+         y2="270.514"
+         id="line9321" /><line
+         fill="none"
+         stroke="#000000"
+         stroke-width="2"
+         x1="37"
+         y1="276.514"
+         x2="111"
+         y2="276.514"
+         id="line9323" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="37"
+         y1="247"
+         x2="111"
+         y2="247"
+         id="line9325" /><line
+         fill="none"
+         stroke="#B285BC"
+         stroke-width="2"
+         x1="37"
+         y1="253"
+         x2="111"
+         y2="253"
+         id="line9327" /><rect
+         x="27.628"
+         y="317"
+         fill="none"
+         width="92.743"
+         height="14"
+         id="rect9329" /><text
+         transform="matrix(1 0 0 1 44.3105 325.2803)"
+         font-family="'Consolas'"
+         font-size="12"
+         id="text9331">FILE2.txt</text>
+</g></g><rect
+     style="fill:none"
+     id="rect9364"
+     height="14"
+     width="85.542"
+     y="183.069"
+     x="395.19501" /><g
+     id="g9403"><g
+       id="g9358"><rect
+         x="399.466"
+         y="173.76801"
+         width="45.956001"
+         height="30.604"
+         id="rect9360"
+         style="fill:#45beee" /><polygon
+         points="482.614,188.163 442.062,158.571 442.062,218.695 "
+         id="polygon9362"
+         style="fill:#45beee" /></g><text
+       y="191.34959"
+       x="404.97849"
+       font-size="12"
+       id="text9366"
+       style="font-size:12px;font-family:Consolas">git commit</text>
+</g><rect
+     style="fill:none"
+     id="rect9368"
+     height="17"
+     width="147"
+     y="235.01401"
+     x="257" /><text
+     style="font-size:12px;font-family:Helvetica"
+     id="text9370"
+     font-size="12"
+     x="297.47659"
+     y="243.6416">staging area</text>
+<rect
+     style="fill:none"
+     id="rect9372"
+     height="17"
+     width="147"
+     y="306"
+     x="475" /><text
+     style="font-size:12px;font-family:Helvetica"
+     id="text9374"
+     font-size="12"
+     x="522.15619"
+     y="314.6279">repository</text>
+<g
+     id="g9437"><g
+       transform="translate(-212.84669,28.971837)"
+       id="g9411"><rect
+         style="fill:#45beee"
+         id="rect9413"
+         height="30.604004"
+         width="88.57531"
+         y="173.76801"
+         x="356.84668" /><polygon
+         style="fill:#45beee"
+         id="polygon9415"
+         points="442.062,218.695 482.614,188.163 442.062,158.571 " /></g><text
+       style="font-size:12px;font-family:Consolas"
+       id="text9417"
+       font-size="12"
+       x="148.13179"
+       y="220.32143">git add FILE2.txt</text>
+</g><g
+     id="g9443"
+     transform="translate(0,-82)"><g
+       id="g9445"
+       transform="translate(-212.84669,28.971837)"><rect
+         x="356.84668"
+         y="173.76801"
+         width="88.57531"
+         height="30.604004"
+         id="rect9447"
+         style="fill:#45beee" /><polygon
+         points="442.062,158.571 442.062,218.695 482.614,188.163 "
+         id="polygon9449"
+         style="fill:#45beee" /></g><text
+       y="220.32143"
+       x="148.13179"
+       font-size="12"
+       id="text9451"
+       style="font-size:12px;font-family:Consolas">git add FILE1.txt</text>
+</g></svg>
\ No newline at end of file
diff --git a/fig/github-collaboration.svg b/fig/github-collaboration.svg
index 7aaab3f..2e79e17 100644
--- a/fig/github-collaboration.svg
+++ b/fig/github-collaboration.svg
@@ -23,7 +23,7 @@
    sodipodi:docname="github-collaboration.svg"><metadata
      id="metadata4778"><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><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs4776"><linearGradient
        y2="363.47269"
        x2="480.35739"
@@ -89,8 +89,8 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="768"
+     inkscape:window-width="1362"
+     inkscape:window-height="729"
      id="namedview4774"
      showgrid="false"
      showguides="true"
@@ -100,9 +100,9 @@
      fit-margin-bottom="0"
      inkscape:zoom="0.83382282"
      inkscape:cx="402.0795"
-     inkscape:cy="334.63872"
+     inkscape:cy="430.58236"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg4593" /><text
      xml:space="preserve"
@@ -542,7 +542,7 @@
                id="tspan10478"
                font-size="10.8"
                y="21.6"
-               x="0">origin https://github.com/wolfman/planets.git</tspan></text>
+               x="0">origin https://github.com/vlad/planets.git</tspan></text>
 </g><rect
            style="fill:none"
            id="rect10480"
@erinmgraham erinmgraham mentioned this pull request Nov 3, 2024
Closed
@erinmgraham erinmgraham mentioned this pull request Jan 17, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@efarsarakis @jiffyclub @gvwilson @archer-training