Skip to content

Instantly share code, notes, and snippets.

@gibson042
Last active August 29, 2015 14:21
Show Gist options
  • Save gibson042/e46deff99451a7edbecf to your computer and use it in GitHub Desktop.
Save gibson042/e46deff99451a7edbecf to your computer and use it in GitHub Desktop.
Git and GitHub

Clone me with the URL at right! Make changes!

Display the source blob
Display the rendered blob
Raw
<svg id="ExplainGitZen" height="496" width="870" xmlns="http://www.w3.org/2000/svg">
<desc>
Initially created at http://onlywei.github.io/explain-git-with-d3/
git commit
git branch rev
git commit
git checkout rev
git commit
git merge master
git commit
git reset --hard HEAD^
git checkout master
git commit
git commit
</desc>
<style type="text/css">
circle.commit {
fill: #EEEEEE;
stroke: #888888;
stroke-width: 3;
}
circle.commit.checked-out {
fill: #CCFFCC !important;
stroke: #339900;
}
circle.commit.merge-commit {
stroke: #663300;
fill: #FFFFCC;
}
circle.commit.reverted {
fill: #FFC;
stroke: #933;
}
circle.commit.rebased {
stroke: #3300CC;
fill: #CCCCFF;
}
circle.commit.branchless {
fill: #FEFEFE;
stroke: #DDD;
}
.commit-pointer {
stroke: #666;
stroke-width: 4;
}
.merge-pointer {
stroke: #663300;
stroke-width: 4;
}
.commit-pointer.branchless,
.merge-pointer.branchless {
stroke: #DDD;
stroke-width: 2;
}
text.id-label {
display: none;
text-anchor: middle;
font-family: Courier New;
fill: #666;
font-size: 10px;
}
g.branch-tag &gt; rect {
fill: #FFCC66;
stroke: #CC9900;
stroke-width: 2;
}
g.branch-tag.git-tag &gt; rect {
fill: #7FC9FF;
stroke: #0026FF;
}
g.branch-tag.remote-branch &gt; rect {
fill: #CCC;
stroke: #888;
}
g.branch-tag &gt; text {
text-anchor: middle;
fill: #000;
font-size: 18px;
font-family: Arial;
}
g.head-tag {
display: none;
}
g.head-tag &gt; rect {
fill: #CCFFCC;
stroke: #339900;
stroke-width: 2;
}
g.head-tag &gt; text {
text-anchor: middle;
fill: #000;
font-size: 11px;
font-family: Arial;
font-weight: bold;
text-transform: uppercase;
}
</style>
<defs>
<marker id="triangle" refX="5" refY="5" markerUnits="strokeWidth" fill="#666" markerWidth="4" markerHeight="3" orient="auto" viewBox="0 0 10 10">
<path d="M 0 0 L 10 5 L 0 10 z"></path>
</marker>
<marker id="faded-triangle" refX="5" refY="5" markerUnits="strokeWidth" fill="#DDD" markerWidth="4" markerHeight="3" orient="auto" viewBox="0 0 10 10">
<path d="M 0 0 L 10 5 L 0 10 z"></path>
</marker>
<marker id="brown-triangle" refX="5" refY="5" markerUnits="strokeWidth" fill="#663300" markerWidth="4" markerHeight="3" orient="auto" viewBox="0 0 10 10">
<path d="M 0 0 L 10 5 L 0 10 z"></path>
</marker>
</defs>
<g class="pointers"><line id="ExplainGitZen-e137e9b-to-initial" class="commit-pointer" x1="24" y1="298" x2="-8.8" y2="298" marker-end="url(#triangle)" style="display:none"></line><line id="ExplainGitZen-531a9c6-to-e137e9b" class="commit-pointer" x1="114" y1="298" x2="81.2" y2="298" marker-end="url(#triangle)"></line><line id="ExplainGitZen-0d8eeb5-to-531a9c6" class="commit-pointer" x1="204" y1="298" x2="171.2" y2="298" marker-end="url(#triangle)"></line><line id="ExplainGitZen-bde1c1c-to-531a9c6" class="commit-pointer" x1="211.61522368914976" y1="226.38477631085024" x2="162.06173157302027" y2="275.93826842697973" marker-end="url(#triangle)"></line><line id="ExplainGitZen-2068c17-to-bde1c1c" class="commit-pointer" x1="294" y1="208" x2="261.2" y2="208" marker-end="url(#triangle)"></line><polyline id="ExplainGitZen-2068c17-to-0d8eeb5" class="merge-pointer" points="301.6152236891498,226.38477631085024 252.06173157302027,275.93826842697973" marker-end="url(#brown-triangle)"></polyline><line id="ExplainGitZen-90ed54a-to-2068c17" class="commit-pointer branchless" x1="384" y1="208" x2="351.2" y2="208" marker-end="url(#faded-triangle)"></line><line id="ExplainGitZen-1cc0574-to-0d8eeb5" class="commit-pointer" x1="294" y1="298" x2="261.2" y2="298" marker-end="url(#triangle)"></line><line id="ExplainGitZen-025f19d-to-1cc0574" class="commit-pointer" x1="384" y1="298" x2="351.2" y2="298" marker-end="url(#triangle)"></line></g>
<g class="commits"><text class="id-label" x="410" y="332">025f19d..</text><text class="id-label" x="320" y="332">1cc0574..</text><text class="id-label" x="410" y="242">90ed54a..</text><text class="id-label" x="320" y="242">2068c17..</text><text class="id-label" x="230" y="242">bde1c1c..</text><text class="id-label" x="230" y="332">0d8eeb5..</text><text class="id-label" x="140" y="332">531a9c6..</text><text class="id-label" x="50" y="332">e137e9b..</text><circle id="ExplainGitZen-e137e9b" class="commit" cx="50" cy="298" r="20"></circle><circle id="ExplainGitZen-531a9c6" class="commit" cx="140" cy="298" r="20"></circle><circle id="ExplainGitZen-0d8eeb5" class="commit" cx="230" cy="298" r="20"></circle><circle id="ExplainGitZen-bde1c1c" class="commit" cx="230" cy="208" r="20"></circle><circle id="ExplainGitZen-2068c17" class="commit merge-commit" cx="320" cy="208" r="20"></circle><circle id="ExplainGitZen-90ed54a" class="commit branchless" cx="410" cy="208" r="20"></circle><circle id="ExplainGitZen-1cc0574" class="commit" cx="320" cy="298" r="20"></circle><circle id="ExplainGitZen-025f19d" class="commit" cx="410" cy="298" r="20"></circle></g>
<g class="tags"><g class="branch-tag" transform="translate(0 -15)"><rect width="46" height="20" y="338" x="387"></rect><text y="354" x="410">base</text></g><g class="branch-tag head-tag"><rect width="34" height="20" y="363" x="393"></rect><text y="377" x="410">HEAD</text></g><g class="branch-tag"><rect width="28" height="20" y="163" x="306"></rect><text y="179" x="320">rev</text></g></g>
</svg>
Display the source blob
Display the rendered blob
Raw
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Display the source blob
Display the rendered blob
Raw
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment