diff --git a/images/2fa-1.png b/images/2fa-1.png index 5abd7437..02725b9e 100644 Binary files a/images/2fa-1.png and b/images/2fa-1.png differ diff --git a/images/advance-master.png b/images/advance-master.png index c3a7ebe6..44aa8de6 100644 Binary files a/images/advance-master.png and b/images/advance-master.png differ diff --git a/images/advance-master.svg b/images/advance-master.svg new file mode 100644 index 00000000..4fede8f4 --- /dev/null +++ b/images/advance-master.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/advance-master + + + + images/advance-master + Created with Sketch. + + + + + + + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + 87ab2 + + + + c2b9e + + + + + + + testing + + + + + + + master + + + + + HEAD + + + diff --git a/images/advance-testing.png b/images/advance-testing.png index 312e65e1..82e07c09 100644 Binary files a/images/advance-testing.png and b/images/advance-testing.png differ diff --git a/images/advance-testing.svg b/images/advance-testing.svg new file mode 100644 index 00000000..2a061b12 --- /dev/null +++ b/images/advance-testing.svg @@ -0,0 +1,52 @@ + + + + + + image/svg+xml + + images/advance-testing + + + + images/advance-testing + Created with Sketch. + + + + + + + + + master + + + + + f30ab + + + + 87ab2 + + + + 34ac2 + + + + 98ca9 + + + + + + testing + + + + + HEAD + + diff --git a/images/areas.png b/images/areas.png index da98fb03..94b77a1e 100644 Binary files a/images/areas.png and b/images/areas.png differ diff --git a/images/areas.svg b/images/areas.svg new file mode 100644 index 00000000..c7840b10 --- /dev/null +++ b/images/areas.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + images/areas + + + + images/areas + Created with Sketch. + + + + + + + + + + + + StagingArea + + + + + .git directory(Repository) + + + + Checkout the project + + + + Stage Fixes + + + + Commit + + + + + + WorkingTree + + + + + diff --git a/images/basic-branching-1.png b/images/basic-branching-1.png index acc3866f..c6c6a38b 100644 Binary files a/images/basic-branching-1.png and b/images/basic-branching-1.png differ diff --git a/images/basic-branching-1.svg b/images/basic-branching-1.svg new file mode 100644 index 00000000..d977cfbf --- /dev/null +++ b/images/basic-branching-1.svg @@ -0,0 +1,36 @@ + + + + + + image/svg+xml + + images/basic-branching-1 + + + + + images/basic-branching-1 + Created with Sketch. + + + C0 + + + + + + C1 + + + + C2 + + + + + + master + + + diff --git a/images/basic-branching-2.png b/images/basic-branching-2.png index c3f14914..8b7ff3c4 100644 Binary files a/images/basic-branching-2.png and b/images/basic-branching-2.png differ diff --git a/images/basic-branching-2.svg b/images/basic-branching-2.svg new file mode 100644 index 00000000..6de51057 --- /dev/null +++ b/images/basic-branching-2.svg @@ -0,0 +1,41 @@ + + + + + + image/svg+xml + + images/basic-branching-2 + + + + + images/basic-branching-2 + Created with Sketch. + + + + C0 + + + + + + + + C1 + + + + C2 + + + + master + + + + iss53 + + + diff --git a/images/basic-branching-3.png b/images/basic-branching-3.png index ebc9ca95..f4df8ce4 100644 Binary files a/images/basic-branching-3.png and b/images/basic-branching-3.png differ diff --git a/images/basic-branching-3.svg b/images/basic-branching-3.svg new file mode 100644 index 00000000..0192c1b4 --- /dev/null +++ b/images/basic-branching-3.svg @@ -0,0 +1,50 @@ + + + + + + image/svg+xml + + images/basic-branching-3 + + + + + images/basic-branching-3 + Created with Sketch. + + + + + + + + + C0 + + + + C1 + + + + C2 + + + + C3 + + + + + master + + + + + + iss53 + + + + diff --git a/images/basic-branching-4.png b/images/basic-branching-4.png index ab8f2228..e81d5636 100644 Binary files a/images/basic-branching-4.png and b/images/basic-branching-4.png differ diff --git a/images/basic-branching-4.svg b/images/basic-branching-4.svg new file mode 100644 index 00000000..59691bd2 --- /dev/null +++ b/images/basic-branching-4.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/basic-branching-4 + + + + + images/basic-branching-4 + Created with Sketch. + + + + + + + + + + C0 + + + + C1 + + + + C2 + + + + + master + + + + + + + hotfix + + + + + C4 + + + + C3 + + + + + iss53 + + + + + + diff --git a/images/basic-branching-5.png b/images/basic-branching-5.png index 947133f7..269dbdd1 100644 Binary files a/images/basic-branching-5.png and b/images/basic-branching-5.png differ diff --git a/images/basic-branching-5.svg b/images/basic-branching-5.svg new file mode 100644 index 00000000..d3d8e87d --- /dev/null +++ b/images/basic-branching-5.svg @@ -0,0 +1,62 @@ + + + + + + image/svg+xml + + images/basic-branching-5 + + + + + images/basic-branching-5 + Created with Sketch. + + + + + + + C0 + + + + C1 + + + + C2 + + + + + master + + + + + + + hotfix + + + + + C4 + + + + + C3 + + + + + + + iss53 + + + + diff --git a/images/basic-branching-6.png b/images/basic-branching-6.png index 6023d694..1e5a1c0c 100644 Binary files a/images/basic-branching-6.png and b/images/basic-branching-6.png differ diff --git a/images/basic-branching-6.svg b/images/basic-branching-6.svg new file mode 100644 index 00000000..feaf578a --- /dev/null +++ b/images/basic-branching-6.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + images/basic-branching-6 + + + + + images/basic-branching-6 + Created with Sketch. + + + + + C0 + + + + C1 + + + + C2 + + + + + + + + + + + + master + + + + + C4 + + + + + + C5 + + + + + C3 + + + + + + iss53 + + + + + diff --git a/images/basic-merging-1.png b/images/basic-merging-1.png index e1bcc27f..82a7148e 100644 Binary files a/images/basic-merging-1.png and b/images/basic-merging-1.png differ diff --git a/images/basic-merging-1.svg b/images/basic-merging-1.svg new file mode 100644 index 00000000..012bc1d4 --- /dev/null +++ b/images/basic-merging-1.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + images/basic-merging-1 + + + + + images/basic-merging-1 + Created with Sketch. + + + + + + + + C0 + + + + C1 + + + + C2 + + + + + + master + + Snapshot toMerge Into + + + C4 + + + + + C5 + + + + C3 + + + + + + iss53 + + + Common Ancestor + Snapshot toMerge In + + + diff --git a/images/basic-merging-2.png b/images/basic-merging-2.png index a2438266..d60f4662 100644 Binary files a/images/basic-merging-2.png and b/images/basic-merging-2.png differ diff --git a/images/basic-merging-2.svg b/images/basic-merging-2.svg new file mode 100644 index 00000000..856d1435 --- /dev/null +++ b/images/basic-merging-2.svg @@ -0,0 +1,68 @@ + + + + + + image/svg+xml + + images/basic-merging-2 + + + + + images/basic-merging-2 + Created with Sketch. + + + + + + + C0 + + + + C1 + + + + C2 + + + + + + + master + + + + + C4 + + + + + + C5 + + + + + + + C6 + + + + C3 + + + + + + iss53 + + + + diff --git a/images/basic-rebase-1.png b/images/basic-rebase-1.png index 44ea49e3..e9494b0f 100644 Binary files a/images/basic-rebase-1.png and b/images/basic-rebase-1.png differ diff --git a/images/basic-rebase-1.svg b/images/basic-rebase-1.svg new file mode 100644 index 00000000..111bbf0d --- /dev/null +++ b/images/basic-rebase-1.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/basic-rebase-1 + + + + + images/basic-rebase-1 + Created with Sketch. + + + + + + + C0 + + + + C1 + + + + C2 + + + + + + + experiment + + + + + + C4 + + + + C3 + + + + + + + master + + + + diff --git a/images/basic-rebase-2.png b/images/basic-rebase-2.png index c82140cd..efb9bc4c 100644 Binary files a/images/basic-rebase-2.png and b/images/basic-rebase-2.png differ diff --git a/images/basic-rebase-2.svg b/images/basic-rebase-2.svg new file mode 100644 index 00000000..6c108519 --- /dev/null +++ b/images/basic-rebase-2.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + images/basic-rebase-2 + + + + + images/basic-rebase-2 + Created with Sketch. + + + + + + C0 + + + + C1 + + + + C2 + + + + + + + + experiment + + + + + C4 + + + + + + C3 + + + + + + C5 + + + + + + master + + + + diff --git a/images/basic-rebase-3.png b/images/basic-rebase-3.png index a1afaef6..846aebcc 100644 Binary files a/images/basic-rebase-3.png and b/images/basic-rebase-3.png differ diff --git a/images/basic-rebase-3.svg b/images/basic-rebase-3.svg new file mode 100644 index 00000000..9bb11f9a --- /dev/null +++ b/images/basic-rebase-3.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/basic-rebase-3 + + + + + images/basic-rebase-3 + Created with Sketch. + + + + + + C0 + + + + C1 + + + + C2 + + + + + + experiment + + + + + + + C4 + + + + + + + C3 + + + + + + C4' + + + + + + master + + + + diff --git a/images/basic-rebase-4.png b/images/basic-rebase-4.png index e97c1685..ea75fce3 100644 Binary files a/images/basic-rebase-4.png and b/images/basic-rebase-4.png differ diff --git a/images/basic-rebase-4.svg b/images/basic-rebase-4.svg new file mode 100644 index 00000000..f7ce55ae --- /dev/null +++ b/images/basic-rebase-4.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/basic-rebase-4 + + + + + images/basic-rebase-4 + Created with Sketch. + + + + + + C0 + + + + C1 + + + + C2 + + + + + + experiment + + + + + + + C3 + + + + + + C4' + + + + + + master + + + + diff --git a/images/benevolent-dictator.png b/images/benevolent-dictator.png index aeb47e7c..3f89db8a 100644 Binary files a/images/benevolent-dictator.png and b/images/benevolent-dictator.png differ diff --git a/images/benevolent-dictator.svg b/images/benevolent-dictator.svg new file mode 100644 index 00000000..a70712c1 --- /dev/null +++ b/images/benevolent-dictator.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/benevolent-dictator + + + + + images/benevolent-dictator + Created with Sketch. + + + + + + + + lieutenant + + + + + + + lieutenant + + + + + + developerpublic + + + + + + + + + + + dictator + + + + developerpublic + + + + developerpublic + + + + + + blessedrepository + + + + diff --git a/images/blink-pull-request-open copy.png b/images/blink-pull-request-open copy.png deleted file mode 100644 index 5e40c6d9..00000000 Binary files a/images/blink-pull-request-open copy.png and /dev/null differ diff --git a/images/blink-pull-request-open.png b/images/blink-pull-request-open.png deleted file mode 100644 index 223144c2..00000000 Binary files a/images/blink-pull-request-open.png and /dev/null differ diff --git a/images/branch-and-history.png b/images/branch-and-history.png index 2b4ab17e..71bd27c0 100644 Binary files a/images/branch-and-history.png and b/images/branch-and-history.png differ diff --git a/images/branch-and-history.svg b/images/branch-and-history.svg new file mode 100644 index 00000000..2996565e --- /dev/null +++ b/images/branch-and-history.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/branch-and-history + + + + + images/branch-and-history + Created with Sketch. + + + + + Snapshot C + + + + + Snapshot B + + + + + Snapshot A + + + + f30ab + + + + + + + 34ac2 + + + + 98ca9 + + + + + + master + + + + HEAD + + + + v1.0 + + + diff --git a/images/centralized.png b/images/centralized.png index 9aa3e902..4cdaca13 100644 Binary files a/images/centralized.png and b/images/centralized.png differ diff --git a/images/centralized.svg b/images/centralized.svg new file mode 100644 index 00000000..b5583f1c --- /dev/null +++ b/images/centralized.svg @@ -0,0 +1,39 @@ + + + + + + image/svg+xml + + images/centralized + + + + images/centralized + Created with Sketch. + + + + + developer + + + + developer + + + + developer + + + + + + + + sharedrepository + + + + + diff --git a/images/checkout-master.png b/images/checkout-master.png index 06e98787..a133f42a 100644 Binary files a/images/checkout-master.png and b/images/checkout-master.png differ diff --git a/images/checkout-master.svg b/images/checkout-master.svg new file mode 100644 index 00000000..04a1a20a --- /dev/null +++ b/images/checkout-master.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + images/checkout-master + + + + + images/checkout-master + Created with Sketch. + + + + + + + + + master + + + + f30ab + + + + 87ab2 + + + + 34ac2 + + + + 98ca9 + + + + + testing + + + + + HEAD + + + + diff --git a/images/clean.png b/images/clean.png index ec8fcaa5..677a8c5b 100644 Binary files a/images/clean.png and b/images/clean.png differ diff --git a/images/clean.svg b/images/clean.svg new file mode 100644 index 00000000..7683b330 --- /dev/null +++ b/images/clean.svg @@ -0,0 +1,282 @@ + + + + + + + image/svg+xml + + images/clean + + + + + images/clean + Created with Sketch. + + + + + + + fileA.txt + + + + + + + fileA.txt' + + + + + + fileB.txt' + + + + + + fileB.txt + + + + + + fileC.rb + + + + + + fileC.rb + + + + Staging Area + + + Working Directory + + + *.txt Filter + + + + + smudge + + + + + + clean + + + + + + + + + + + diff --git a/images/commit-and-tree.png b/images/commit-and-tree.png index 3ddf1cd5..e840e891 100644 Binary files a/images/commit-and-tree.png and b/images/commit-and-tree.png differ diff --git a/images/commit-and-tree.svg b/images/commit-and-tree.svg new file mode 100644 index 00000000..3c3112b8 --- /dev/null +++ b/images/commit-and-tree.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/commit-and-tree + + + + + images/commit-and-tree + Created with Sketch. + + + + + size 5b1d3 README 911e7 LICENSE cba0a test.rb + treeblobblobblob + + + + The initial commit of my project + + size 92ec2 Scott Scott + committreeauthorcommitter + + 98ca9 + + 92ec2 + + + size + blob + == Testing library This library is used to test Ruby projects. + 5b1d3 + + + + size + blob + The MIT License Copyright (c) 2008 Scott Chacon Permission is hereby granted, free of charge, to any person + 911e7 + + + + size + blob + require 'logger' require 'test/unit' class Test::Unit::TestCase + cba0a + + + + + + + + + + diff --git a/images/commits-and-parents.png b/images/commits-and-parents.png index d5639726..399b2d00 100644 Binary files a/images/commits-and-parents.png and b/images/commits-and-parents.png differ diff --git a/images/commits-and-parents.svg b/images/commits-and-parents.svg new file mode 100644 index 00000000..ee786daa --- /dev/null +++ b/images/commits-and-parents.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + images/commits-and-parents + + + + + images/commits-and-parents + Created with Sketch. + + + Snapshot A + + + + Snapshot B + + + 98ca9 + 34ac2 + + + + Snapshot C + + + f30ab + + + + Fixed bug #1328 - stack overflow under certain conditions + + size 184ca 98ca9 Scott Scott + committreeparentauthorcommitter + + + + + The initial commit of my project + + size 92ec2 Scott Scott + committreeparentauthorcommitter + + + + + add feature #32 - ability to add new formats to the central interface + + size 0de24 34ac2 Scott Scott + committreeparentauthorcommitter + + + + diff --git a/images/data-model-1.png b/images/data-model-1.png index 9331e915..410ff7db 100644 Binary files a/images/data-model-1.png and b/images/data-model-1.png differ diff --git a/images/data-model-1.svg b/images/data-model-1.svg new file mode 100644 index 00000000..5888cbe3 --- /dev/null +++ b/images/data-model-1.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/data-model-1 + + + + + images/data-model-1 + Created with Sketch. + + + + blob + + + + blob + + + + blob + + + + + + + + simplegit.rb + + + + Rakefile + + + + README + + + + lib + + + + tree + + + + tree + + + diff --git a/images/data-model-2.png b/images/data-model-2.png index eb1d48e1..1d748727 100644 Binary files a/images/data-model-2.png and b/images/data-model-2.png differ diff --git a/images/data-model-2.svg b/images/data-model-2.svg new file mode 100644 index 00000000..a675500e --- /dev/null +++ b/images/data-model-2.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + images/data-model-2 + + + + + images/data-model-2 + Created with Sketch. + + + + + "version 2" + 1f7a7a + + + + "new file" + fa49b0 + + + + "version 1" + 83baae + + + + + + + + test.txt + + + + test.txt + + + + new.txt + + + + bak + + + + + tree + 3c4e9c + + + + + tree + d8329f + + + + diff --git a/images/data-model-3.png b/images/data-model-3.png index 317acbb0..5aa0edef 100644 Binary files a/images/data-model-3.png and b/images/data-model-3.png differ diff --git a/images/data-model-3.svg b/images/data-model-3.svg new file mode 100644 index 00000000..0f03b451 --- /dev/null +++ b/images/data-model-3.svg @@ -0,0 +1,97 @@ + + + + + + image/svg+xml + + images/data-model-3 + + + + + images/data-model-3 + Created with Sketch. + + + + + + + + + + + + + "version 2" + 1f7a7a + + + + "new file" + fa49b0 + + + + "version 1" + 83baae + + + + test.txt + + + + test.txt + + + + test.txt + + + + new.txt + + + + new.txt + + + + bak + + + + tree + 3c4e9c + + + + third commit + 1a410e + + + + + second commit + cac0ca + + + + + first commit + fdf4fc + + + + tree + 0155eb + + + + tree + d8329f + + + diff --git a/images/data-model-4.png b/images/data-model-4.png index 38136440..98cc08a1 100644 Binary files a/images/data-model-4.png and b/images/data-model-4.png differ diff --git a/images/data-model-4.svg b/images/data-model-4.svg new file mode 100644 index 00000000..05b8bd8b --- /dev/null +++ b/images/data-model-4.svg @@ -0,0 +1,111 @@ + + + + + + image/svg+xml + + images/data-model-4 + + + + + images/data-model-4 + Created with Sketch. + + + + + + + + + + + + + "version 2" + 1f7a7a + + + + "new file" + fa49b0 + + + + "version 1" + 83baae + + + + test.txt + + + + test.txt + + + + test.txt + + + + new.txt + + + + new.txt + + + + bak + + + + tree + 3c4e9c + + + + third commit + 1a410e + + + + + second commit + cac0ca + + + + + first commit + fdf4fc + + + + + + refs/heads/test + + + + + + + refs/heads/master + + + + + tree + 0155eb + + + + tree + d8329f + + + diff --git a/images/deltas.png b/images/deltas.png index 47904edb..0ea5684c 100644 Binary files a/images/deltas.png and b/images/deltas.png differ diff --git a/images/deltas.svg b/images/deltas.svg new file mode 100644 index 00000000..9dc3a541 --- /dev/null +++ b/images/deltas.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + images/deltas + + + + images/deltas + Created with Sketch. + + + Version 1 + + Version 2 + + Version 3 + + Version 4 + + Version 5 + + + File A + + + File A + + Δ1 + + Δ1 + + Δ2 + + Δ1 + + Δ2 + + Δ2 + + Δ3 + + File B + + File C + + + + + + + + + + + + Checkins Over Time + diff --git a/images/distributed.png b/images/distributed.png index 53cfcaeb..83466743 100644 Binary files a/images/distributed.png and b/images/distributed.png differ diff --git a/images/distributed.svg b/images/distributed.svg new file mode 100644 index 00000000..072dc470 --- /dev/null +++ b/images/distributed.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + images/distributed + + + + images/distributed + Created with Sketch. + + + + Version Database + + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + Server Computer + + + Version Database + + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + Computer A + + + File + + + + + + Version Database + + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + Computer B + + + File + + + + + + + + diff --git a/images/double-dot.png b/images/double-dot.png index 53175c15..0f50ff5b 100644 Binary files a/images/double-dot.png and b/images/double-dot.png differ diff --git a/images/double-dot.svg b/images/double-dot.svg new file mode 100644 index 00000000..465b050e --- /dev/null +++ b/images/double-dot.svg @@ -0,0 +1,330 @@ + + + + + + image/svg+xml + + images/double-dot + + + + + + + + + images/double-dot + Created with Sketch. + + + + + A + + + + + + + + B + + + + + + + + + E + + + + + + + + + + F + + + + + + + + + C + + + + + + + + + D + + + + + + + + + master + + + + + + + + + experiment + + + + + diff --git a/images/emoji.png b/images/emoji.png deleted file mode 100644 index 42b01fb0..00000000 Binary files a/images/emoji.png and /dev/null differ diff --git a/images/gitlab-broadcast.png b/images/gitlab-broadcast.png deleted file mode 100644 index 8d3f690d..00000000 Binary files a/images/gitlab-broadcast.png and /dev/null differ diff --git a/images/head-to-master.png b/images/head-to-master.png index 86c7ae85..cc6a65b9 100644 Binary files a/images/head-to-master.png and b/images/head-to-master.png differ diff --git a/images/head-to-master.svg b/images/head-to-master.svg new file mode 100644 index 00000000..285833a8 --- /dev/null +++ b/images/head-to-master.svg @@ -0,0 +1,46 @@ + + + + + + image/svg+xml + + images/head-to-master + + + + + images/head-to-master + Created with Sketch. + + + + + + + + + master + + + + testing + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + HEAD + + + diff --git a/images/head-to-testing.png b/images/head-to-testing.png index 08352d60..6b329fdd 100644 Binary files a/images/head-to-testing.png and b/images/head-to-testing.png differ diff --git a/images/head-to-testing.svg b/images/head-to-testing.svg new file mode 100644 index 00000000..0ea2c506 --- /dev/null +++ b/images/head-to-testing.svg @@ -0,0 +1,46 @@ + + + + + + image/svg+xml + + images/head-to-testing + + + + + images/head-to-testing + Created with Sketch. + + + + + + + + master + + + + testing + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + + HEAD + + + diff --git a/images/hubot.png b/images/hubot.png deleted file mode 100644 index b057f1de..00000000 Binary files a/images/hubot.png and /dev/null differ diff --git a/images/integration-manager.png b/images/integration-manager.png index fd0d531e..d5432179 100644 Binary files a/images/integration-manager.png and b/images/integration-manager.png differ diff --git a/images/integration-manager.svg b/images/integration-manager.svg new file mode 100644 index 00000000..2661c070 --- /dev/null +++ b/images/integration-manager.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + images/integration-manager + + + + + images/integration-manager + Created with Sketch. + + + + + + developer public + + + + developer private + + + + + + + + + + + + + blessedrepository + + + + integrationmanager + + + + developerpublic + + + + developerpublic + + developerprivate + developerprivate + + + + diff --git a/images/interesting-rebase-1.png b/images/interesting-rebase-1.png index ed58a06c..ac53ee0c 100644 Binary files a/images/interesting-rebase-1.png and b/images/interesting-rebase-1.png differ diff --git a/images/interesting-rebase-1.svg b/images/interesting-rebase-1.svg new file mode 100644 index 00000000..5c520bf9 --- /dev/null +++ b/images/interesting-rebase-1.svg @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + images/interesting-rebase-1 + + + + + images/interesting-rebase-1 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + + C3 + + + + + + + C4 + + + + + + + + + C8 + + + + + + + C9 + + + + + + + C10 + + + + + + + server + + + + + + client + + + diff --git a/images/interesting-rebase-2.png b/images/interesting-rebase-2.png index 95c30681..4984b898 100644 Binary files a/images/interesting-rebase-2.png and b/images/interesting-rebase-2.png differ diff --git a/images/interesting-rebase-2.svg b/images/interesting-rebase-2.svg new file mode 100644 index 00000000..fb5feecb --- /dev/null +++ b/images/interesting-rebase-2.svg @@ -0,0 +1,110 @@ + + + + + + image/svg+xml + + images/interesting-rebase-2 + + + + + images/interesting-rebase-2 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + + C8' + + + + + + + C9' + + + + + + + C3 + + + + + + + C4 + + + + + + + C8 + + + + + C9 + + + + + + + C10 + + + + + + + server + + + + + + + client + + + + diff --git a/images/interesting-rebase-3.png b/images/interesting-rebase-3.png index 45aeeca2..c8a0bdc4 100644 Binary files a/images/interesting-rebase-3.png and b/images/interesting-rebase-3.png differ diff --git a/images/interesting-rebase-3.svg b/images/interesting-rebase-3.svg new file mode 100644 index 00000000..cb5e2e63 --- /dev/null +++ b/images/interesting-rebase-3.svg @@ -0,0 +1,92 @@ + + + + + + image/svg+xml + + images/interesting-rebase-3 + + + + + images/interesting-rebase-3 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + + C8' + + + + + + C9' + + + + + C3 + + + + + + C4 + + + + + + C10 + + + + + + server + + + + + + + client + + + + diff --git a/images/interesting-rebase-4.png b/images/interesting-rebase-4.png index 44b6ca5f..e815f760 100644 Binary files a/images/interesting-rebase-4.png and b/images/interesting-rebase-4.png differ diff --git a/images/interesting-rebase-4.svg b/images/interesting-rebase-4.svg new file mode 100644 index 00000000..df0604b3 --- /dev/null +++ b/images/interesting-rebase-4.svg @@ -0,0 +1,109 @@ + + + + + + image/svg+xml + + images/interesting-rebase-4 + + + + + images/interesting-rebase-4 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + + C8' + + + + + C9' + + + + + C3' + + + + + + C4' + + + + + + C10' + + + + + + C3 + + + + + + C4 + + + + + + C10 + + + + + + + server + + + + + + + client + + + + diff --git a/images/interesting-rebase-5.png b/images/interesting-rebase-5.png index aa0745db..9ee451a5 100644 Binary files a/images/interesting-rebase-5.png and b/images/interesting-rebase-5.png differ diff --git a/images/interesting-rebase-5.svg b/images/interesting-rebase-5.svg new file mode 100644 index 00000000..18907ad9 --- /dev/null +++ b/images/interesting-rebase-5.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + images/interesting-rebase-5 + + + + + images/interesting-rebase-5 + Created with Sketch. + + + + C1 + + + + + + C2 + + + + + + + C5 + + + + + + + master + + + + + + + C6 + + + + + C8' + + + + C9' + + + + + C3' + + + + + + C4' + + + + + + C10' + + + diff --git a/images/jb.png b/images/jb.png new file mode 100644 index 00000000..2ffe74a8 Binary files /dev/null and b/images/jb.png differ diff --git a/images/large-merges-1.png b/images/large-merges-1.png index d3ee025a..d043166a 100644 Binary files a/images/large-merges-1.png and b/images/large-merges-1.png differ diff --git a/images/large-merges-1.svg b/images/large-merges-1.svg new file mode 100644 index 00000000..534f8748 --- /dev/null +++ b/images/large-merges-1.svg @@ -0,0 +1,126 @@ + + + + + + image/svg+xml + + images/large-merges-1 + + + + + images/large-merges-1 + Created with Sketch. + + + + + master + + + + + + tv/rebase-stat + + + + + + + jk/clone-checkout + + + + + + + db/push-cleanup + + + + + + + js/notes + + + + + + + ps/blame + + + + + C1 + + + + + C2 + + + + + + + + + C3 + + + + C5 + + + + C7 + + + + C9 + + + + C11 + + + + + + C4 + + + + + + + C6 + + + + + + + C8 + + + + + + + C10 + + + + + + + C12 + + + + diff --git a/images/large-merges-2.png b/images/large-merges-2.png index 2d23e691..71b07b77 100644 Binary files a/images/large-merges-2.png and b/images/large-merges-2.png differ diff --git a/images/large-merges-2.svg b/images/large-merges-2.svg new file mode 100644 index 00000000..d8f782c8 --- /dev/null +++ b/images/large-merges-2.svg @@ -0,0 +1,172 @@ + + + + + + image/svg+xml + + images/large-merges-2 + + + + + images/large-merges-2 + Created with Sketch. + + + + + + master + + + + + + + tv/rebase-stat + + + + + + + jk/clone-checkout + + + + + + + db/push-cleanup + + + + + + + js/notes + + + + + + + pu + + + + + + + next + + + + + + + ps/blame + + + + + C1 + + + + + C2 + + + + + + + + + + + + C3 + + + + C5 + + + + C7 + + + + C9 + + + + C11 + + + + + + C4 + + + + + + C16 + + + + + C17 + + + + + C13 + + + + + C14 + + + + + C15 + + + + + + C6 + + + + + + + C8 + + + + + + + C10 + + + + + + + C12 + + + + + + diff --git a/images/lifecycle.png b/images/lifecycle.png index 922b02c0..68bf3a4e 100644 Binary files a/images/lifecycle.png and b/images/lifecycle.png differ diff --git a/images/lifecycle.svg b/images/lifecycle.svg new file mode 100644 index 00000000..7e6ec6ab --- /dev/null +++ b/images/lifecycle.svg @@ -0,0 +1,49 @@ + + + + + + image/svg+xml + + images/lifecycle + + + + + images/lifecycle + Created with Sketch. + + + + + + + + + Modified + + + + + + + Edit the file + Add the file + Remove the file + Stage the file + + + Untracked + + + + Unmodified + + Commit + + + Staged + + + + diff --git a/images/local.png b/images/local.png index 1779acfb..067e27e6 100644 Binary files a/images/local.png and b/images/local.png differ diff --git a/images/local.svg b/images/local.svg new file mode 100644 index 00000000..dcc3a07a --- /dev/null +++ b/images/local.svg @@ -0,0 +1,44 @@ + + + + + + image/svg+xml + + images/local + + + + images/local + Created with Sketch. + + + + Local Computer + + Version Database + Checkout + + + File + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + + + diff --git a/images/lr-branches-1.png b/images/lr-branches-1.png index ad7c9c9a..bafc6048 100644 Binary files a/images/lr-branches-1.png and b/images/lr-branches-1.png differ diff --git a/images/lr-branches-1.svg b/images/lr-branches-1.svg new file mode 100644 index 00000000..ad050292 --- /dev/null +++ b/images/lr-branches-1.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + images/lr-branches-1 + + + + + images/lr-branches-1 + Created with Sketch. + + + + C1 + + + + + C2 + + + + + C3 + + + + + C4 + + + + + C5 + + + + + C6 + + + + + C7 + + + + + + master + + + + + + + develop + + + + + + + topic + + + + diff --git a/images/lr-branches-2.png b/images/lr-branches-2.png index 8db4bc08..bf8bdc05 100644 Binary files a/images/lr-branches-2.png and b/images/lr-branches-2.png differ diff --git a/images/lr-branches-2.svg b/images/lr-branches-2.svg new file mode 100644 index 00000000..cafaedde --- /dev/null +++ b/images/lr-branches-2.svg @@ -0,0 +1,65 @@ + + + + + + image/svg+xml + + images/lr-branches-2 + + + + + images/lr-branches-2 + Created with Sketch. + + + + + + + + + master + develop + topic + + + + + + C1 + + + + + + C2 + + + + + C3 + + + + + C4 + + + + + C5 + + + + + C6 + + + + C7 + + + + diff --git a/images/managed-team-1.png b/images/managed-team-1.png index 489b6322..e5525a79 100644 Binary files a/images/managed-team-1.png and b/images/managed-team-1.png differ diff --git a/images/managed-team-1.svg b/images/managed-team-1.svg new file mode 100644 index 00000000..12bffd39 --- /dev/null +++ b/images/managed-team-1.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + images/managed-team-1 + + + + + images/managed-team-1 + Created with Sketch. + + + + 4b078 + + + + + 1edee + + + + + + 33009 + + + + + + 85127 + + + + + e5b0f + + + + + featureB + + + + + master + + + + featureA + + diff --git a/images/managed-team-2.png b/images/managed-team-2.png index 25c2db2b..725e7e9b 100644 Binary files a/images/managed-team-2.png and b/images/managed-team-2.png differ diff --git a/images/managed-team-2.svg b/images/managed-team-2.svg new file mode 100644 index 00000000..7318ac6a --- /dev/null +++ b/images/managed-team-2.svg @@ -0,0 +1,109 @@ + + + + + + image/svg+xml + + images/managed-team-2 + + + + + images/managed-team-2 + Created with Sketch. + + + + + 4b078 + + + + + 1edee + + + + + + 33009 + + + + + + + aad88 + + + + + + + 774b3 + + + + + + + 85127 + + + + + + cd685 + + + + + fba9a + + + + + e5b0f + + + + + + + + + + + featureB + + + + + + + master + + + + + + + + + + + + featureA + + + + + origin/featureA + + + + origin/featureBee + + + diff --git a/images/managed-team-3.png b/images/managed-team-3.png index a8a08a70..a20e9e3e 100644 Binary files a/images/managed-team-3.png and b/images/managed-team-3.png differ diff --git a/images/managed-team-3.svg b/images/managed-team-3.svg new file mode 100644 index 00000000..bb65880d --- /dev/null +++ b/images/managed-team-3.svg @@ -0,0 +1,116 @@ + + + + + + image/svg+xml + + images/managed-team-3 + + + + + images/managed-team-3 + Created with Sketch. + + + + + + 4b078 + + + + + 1edee + + + + + + 33009 + + + + + + + aad88 + + + + + + + 774b3 + + + + + + 5399e + + + + + + 85127 + + + + + + cd685 + + + + + fba9a + + + + + e5b0f + + + + + + + + + featureB + + + + + + + master + + + + + + + + + + featureA + + + origin/featureBee + + + + origin/featureA + + + + + + + + origin/master + + diff --git a/images/managed-team-flow.png b/images/managed-team-flow.png index 6d83ac4d..7593cdaf 100644 Binary files a/images/managed-team-flow.png and b/images/managed-team-flow.png differ diff --git a/images/managed-team-flow.svg b/images/managed-team-flow.svg new file mode 100644 index 00000000..6bddb3ef --- /dev/null +++ b/images/managed-team-flow.svg @@ -0,0 +1,587 @@ + + + + + + + + image/svg+xml + + images/managed-team-flow + + + + + images/managed-team-flow + Created with Sketch. + + + + + Josie + + + + + + + Josie + + + + + + John + + + + + + + John + + + + + + Jessica + + + + + + + Jessica + + + + + + + git commit + (A) + + + git commit + (B) + + + git fetch origin + + + + git fetch origin + + + + git fetch origin + + + git push origin featureA + + + + git push origin featureA + + + + git push origin featureA + + + + git push origin featureBee + + + + git push origin featureB:featureBee + + + + + git commit + (A) + + + + git commit + (B) + + + + + git merge + (B) + + + + git merge + (A) + + + + git commit + (A) + + + + git merge + (A) + + + + + server:featureA + + + + server:featureBee + + + + server:featureA + + + + server:featureBee + + + diff --git a/images/merging-workflows-1.png b/images/merging-workflows-1.png index 461de6e2..1149352f 100644 Binary files a/images/merging-workflows-1.png and b/images/merging-workflows-1.png differ diff --git a/images/merging-workflows-1.svg b/images/merging-workflows-1.svg new file mode 100644 index 00000000..622cb69b --- /dev/null +++ b/images/merging-workflows-1.svg @@ -0,0 +1,84 @@ + + + + + + image/svg+xml + + images/merging-workflows-1 + + + + + images/merging-workflows-1 + Created with Sketch. + + + + + C1 + + + + + + + C2 + + + + + + C7 + + + + + + C3 + + + + + + + C4 + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + + + ruby_client + + + + + + + php_client + + + + diff --git a/images/merging-workflows-2.png b/images/merging-workflows-2.png index 5a0d1fcf..fc6bc771 100644 Binary files a/images/merging-workflows-2.png and b/images/merging-workflows-2.png differ diff --git a/images/merging-workflows-2.svg b/images/merging-workflows-2.svg new file mode 100644 index 00000000..a96571ce --- /dev/null +++ b/images/merging-workflows-2.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/merging-workflows-2 + + + + + images/merging-workflows-2 + Created with Sketch. + + + + + C1 + + + + + + + C2 + + + + + + + C7 + + + + + + + C3 + + + + + + + C4 + + + + + + + + C9 + + + + + + + + C8 + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + + + ruby_client + + + + + php_client + + + + diff --git a/images/merging-workflows-3.png b/images/merging-workflows-3.png index f3a32367..4e585001 100644 Binary files a/images/merging-workflows-3.png and b/images/merging-workflows-3.png differ diff --git a/images/merging-workflows-3.svg b/images/merging-workflows-3.svg new file mode 100644 index 00000000..4d96149b --- /dev/null +++ b/images/merging-workflows-3.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + images/merging-workflows-3 + + + + + images/merging-workflows-3 + Created with Sketch. + + + + + C1 + + + + + + C2 + + + + + C5 + + + + + + C3 + + + + + + C4 + + + + + + develop + + + + + + + master + + + + + + + ruby_client + + + + diff --git a/images/merging-workflows-4 2.png b/images/merging-workflows-4 2.png deleted file mode 100644 index 32ae908e..00000000 Binary files a/images/merging-workflows-4 2.png and /dev/null differ diff --git a/images/merging-workflows-4.png b/images/merging-workflows-4.png index 2ad04c13..dc611a6a 100644 Binary files a/images/merging-workflows-4.png and b/images/merging-workflows-4.png differ diff --git a/images/merging-workflows-4.svg b/images/merging-workflows-4.svg new file mode 100644 index 00000000..03d27b90 --- /dev/null +++ b/images/merging-workflows-4.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + images/merging-workflows-4 + + + + + images/merging-workflows-4 + Created with Sketch. + + + + + C1 + + + + + + C2 + + + + + C5 + + + + + + C3 + + + + + + + C4 + + + + + + + C6 + + + + + + develop + + + + + + + master + + + + + + + ruby_client + + + + diff --git a/images/merging-workflows-5.png b/images/merging-workflows-5.png index 151cbd27..4a91da4a 100644 Binary files a/images/merging-workflows-5.png and b/images/merging-workflows-5.png differ diff --git a/images/merging-workflows-5.svg b/images/merging-workflows-5.svg new file mode 100644 index 00000000..d817f71e --- /dev/null +++ b/images/merging-workflows-5.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + images/merging-workflows-5 + + + + + images/merging-workflows-5 + Created with Sketch. + + + + + C1 + + + + + + C2 + + + + + C5 + + + + + + C3 + + + + + + + C4 + + + + + + + C6 + + + + + + develop + + + + + + + master + + + + + + + ruby_client + + + + diff --git a/images/notifications.png b/images/notifications.png deleted file mode 100644 index 31e05951..00000000 Binary files a/images/notifications.png and /dev/null differ diff --git a/images/perils-of-rebasing-1.png b/images/perils-of-rebasing-1.png index 013e04bf..f9312184 100644 Binary files a/images/perils-of-rebasing-1.png and b/images/perils-of-rebasing-1.png differ diff --git a/images/perils-of-rebasing-1.svg b/images/perils-of-rebasing-1.svg new file mode 100644 index 00000000..ee813308 --- /dev/null +++ b/images/perils-of-rebasing-1.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-1 + + + + + images/perils-of-rebasing-1 + Created with Sketch. + + + + + + C1 + + + + + + master + + + + + C1 + + + + + C2 + + + + + C3 + + + + + + master + + + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + + diff --git a/images/perils-of-rebasing-2.png b/images/perils-of-rebasing-2.png index 2c14ccdf..6e6f5585 100644 Binary files a/images/perils-of-rebasing-2.png and b/images/perils-of-rebasing-2.png differ diff --git a/images/perils-of-rebasing-2.svg b/images/perils-of-rebasing-2.svg new file mode 100644 index 00000000..210dd495 --- /dev/null +++ b/images/perils-of-rebasing-2.svg @@ -0,0 +1,106 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-2 + + + + + images/perils-of-rebasing-2 + Created with Sketch. + + + + + + + C1 + + + + master + + + + C4 + + + + + + C5 + + + + + C6 + + + My Computer + git.team1.ourcompany.com + + + + C1 + + + + + C3 + + + + + + + C7 + + + + + + + C4 + + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + teamone/master + + + + + + + C2 + + + + + diff --git a/images/perils-of-rebasing-3.png b/images/perils-of-rebasing-3.png index 505407a0..1f0603a1 100644 Binary files a/images/perils-of-rebasing-3.png and b/images/perils-of-rebasing-3.png differ diff --git a/images/perils-of-rebasing-3.svg b/images/perils-of-rebasing-3.svg new file mode 100644 index 00000000..1ad6f7da --- /dev/null +++ b/images/perils-of-rebasing-3.svg @@ -0,0 +1,138 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-3 + + + + + images/perils-of-rebasing-3 + Created with Sketch. + + + + + + + + C1 + + + + + + master + + + + + + C4' + + + + + + C5 + + + + + + + + C4 + + + + + + + + C6 + + + + + + + + C1 + + + + + + C2 + + + + + + + C3 + + + + + + + + C7 + + + + + + + C4' + + + + + + + C4 + + + + + + + C5 + + + + + + + + + C6 + + + + + + + + master + + + + + + + teamone/master + + + + My Computer + git.team1.ourcompany.com + + + diff --git a/images/perils-of-rebasing-4.png b/images/perils-of-rebasing-4.png index 01b9dbba..a1e23f3e 100644 Binary files a/images/perils-of-rebasing-4.png and b/images/perils-of-rebasing-4.png differ diff --git a/images/perils-of-rebasing-4.svg b/images/perils-of-rebasing-4.svg new file mode 100644 index 00000000..f4d24b7f --- /dev/null +++ b/images/perils-of-rebasing-4.svg @@ -0,0 +1,144 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-4 + + + + + images/perils-of-rebasing-4 + Created with Sketch. + + + + + + + C1 + + + + + master + + + + + + C4' + + + + + + + + C5 + + + + + + + C4 + + + + + + + + C6 + + + + + + + + C1 + + + + + + C2 + + + + + + + C3 + + + + + + + + C7 + + + + + + + + C8 + + + + + + + C4' + + + + + + + C4 + + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + + + + + teamone/master + + + + My Computer + git.team1.ourcompany.com + + diff --git a/images/perils-of-rebasing-5.png b/images/perils-of-rebasing-5.png index 20a18929..27c860d0 100644 Binary files a/images/perils-of-rebasing-5.png and b/images/perils-of-rebasing-5.png differ diff --git a/images/perils-of-rebasing-5.svg b/images/perils-of-rebasing-5.svg new file mode 100644 index 00000000..fcdf683f --- /dev/null +++ b/images/perils-of-rebasing-5.svg @@ -0,0 +1,111 @@ + + + + + + image/svg+xml + + images/perils-of-rebasing-5 + + + + + images/perils-of-rebasing-5 + Created with Sketch. + + + + + + C1 + + + + + + master + + + + + + + C4' + + + + + + + C5 + + + + + + + + C4 + + + + + + + + C6 + + + + + + + + + C1 + + + + + + C4' + + + + + + + + + C2' + + + + + + + C3' + + + + + + + C5 + + + + + + + master + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + diff --git a/images/posh-git.png b/images/posh-git.png index f66505cf..d403b6dc 100644 Binary files a/images/posh-git.png and b/images/posh-git.png differ diff --git a/images/public-small-1.png b/images/public-small-1.png index efcb90d6..ae0a8665 100644 Binary files a/images/public-small-1.png and b/images/public-small-1.png differ diff --git a/images/public-small-1.svg b/images/public-small-1.svg new file mode 100644 index 00000000..b9384228 --- /dev/null +++ b/images/public-small-1.svg @@ -0,0 +1,82 @@ + + + + + + image/svg+xml + + images/public-small-1 + + + + + images/public-small-1 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 33009 + + + + + + + 0d708 + + + + + + e5b0f + + + + + a2de3 + + + + + + master + + + + + + + featureA + + + + + + + featureB + + + + + + + + + origin/master + + + + diff --git a/images/public-small-2.png b/images/public-small-2.png index 9dd40631..ba614c1a 100644 Binary files a/images/public-small-2.png and b/images/public-small-2.png differ diff --git a/images/public-small-2.svg b/images/public-small-2.svg new file mode 100644 index 00000000..d1aa124c --- /dev/null +++ b/images/public-small-2.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + images/public-small-2 + + + + + images/public-small-2 + Created with Sketch. + + + + 4b078 + + + + + 1edee + + + + + 33009 + + + + + + 5399e + + + + + + e5b0f + + + + + dee6b + + + + + master + + + + + + featureA + + + + + + + featureB + + + + + + + + + origin/master + + + + diff --git a/images/public-small-3.png b/images/public-small-3.png index fa06f77e..dfe200de 100644 Binary files a/images/public-small-3.png and b/images/public-small-3.png differ diff --git a/images/public-small-3.svg b/images/public-small-3.svg new file mode 100644 index 00000000..2f31fcc7 --- /dev/null +++ b/images/public-small-3.svg @@ -0,0 +1,108 @@ + + + + + + image/svg+xml + + images/public-small-3 + + + + + + + + + + images/public-small-3 + Created with Sketch. + + + + + + 4b078 + + + + + + 1edee + + + + + + + 33009 + + + + + + + 5399e + + + + + + + 17f4d + + + + + + + e5b0f + + + + + + + dee6b + + + + + + + master + + + + + + + featureA + + + + + + + featureB + + + + + + + featureBv2 + + + + + + + + + origin/master + + + + + diff --git a/images/rebasing-1.png b/images/rebasing-1.png index cd3efa16..98311082 100644 Binary files a/images/rebasing-1.png and b/images/rebasing-1.png differ diff --git a/images/rebasing-1.svg b/images/rebasing-1.svg new file mode 100644 index 00000000..85d75a47 --- /dev/null +++ b/images/rebasing-1.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + images/rebasing-1 + + + + + images/rebasing-1 + Created with Sketch. + + + + + 0b743 + + + + + + a6b4c + + + + + f42c5 + + + + + + e43a6 + + + + + + 5ddae + + + + + master + + + + + + ruby_client + + + + diff --git a/images/rebasing-2.png b/images/rebasing-2.png index 55ca410b..406f3d08 100644 Binary files a/images/rebasing-2.png and b/images/rebasing-2.png differ diff --git a/images/rebasing-2.svg b/images/rebasing-2.svg new file mode 100644 index 00000000..087b845f --- /dev/null +++ b/images/rebasing-2.svg @@ -0,0 +1,71 @@ + + + + + + image/svg+xml + + images/rebasing-2 + + + + + images/rebasing-2 + Created with Sketch. + + + + + 0b743 + + + + + + a6b4c + + + + + + f42c5 + + + + + + a0a41 + + + + + + master + + + + + + + + + e43a6 + + + + + + + 5ddae + + + + + + + ruby_client + + + + + diff --git a/images/remote-branches-1.png b/images/remote-branches-1.png index 759538f4..40f0cef4 100644 Binary files a/images/remote-branches-1.png and b/images/remote-branches-1.png differ diff --git a/images/remote-branches-1.svg b/images/remote-branches-1.svg new file mode 100644 index 00000000..1e466427 --- /dev/null +++ b/images/remote-branches-1.svg @@ -0,0 +1,78 @@ + + + + + + image/svg+xml + + images/remote-branches-1 + + + + + images/remote-branches-1 + Created with Sketch. + + + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + + master + + + git.ourcompany.com + git clone janedoe@git.ourcompany.com:project.git + + + + 0b743 + + + + + + a6b4c + + + + + + + f4265 + + + + + + + master + + + + + + + origin/master + + + My Computer + Remote branch + Local branch + + diff --git a/images/remote-branches-2.png b/images/remote-branches-2.png index 14cfe56c..6d5117ee 100644 Binary files a/images/remote-branches-2.png and b/images/remote-branches-2.png differ diff --git a/images/remote-branches-2.svg b/images/remote-branches-2.svg new file mode 100644 index 00000000..b76e0fc9 --- /dev/null +++ b/images/remote-branches-2.svg @@ -0,0 +1,95 @@ + + + + + + image/svg+xml + + images/remote-branches-2 + + + + + images/remote-branches-2 + Created with Sketch. + + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + + + + + My Computer + git.ourcompany.com + Someone else pushes + + diff --git a/images/remote-branches-3.png b/images/remote-branches-3.png index 6d1993e4..cfc942d6 100644 Binary files a/images/remote-branches-3.png and b/images/remote-branches-3.png differ diff --git a/images/remote-branches-3.svg b/images/remote-branches-3.svg new file mode 100644 index 00000000..452ae224 --- /dev/null +++ b/images/remote-branches-3.svg @@ -0,0 +1,104 @@ + + + + + + image/svg+xml + + images/remote-branches-3 + + + + + images/remote-branches-3 + Created with Sketch. + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + + + My Computer + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + git.ourcompany.com + git fetch origin + + + diff --git a/images/remote-branches-4.png b/images/remote-branches-4.png index b4183bf1..a493bffc 100644 Binary files a/images/remote-branches-4.png and b/images/remote-branches-4.png differ diff --git a/images/remote-branches-4.svg b/images/remote-branches-4.svg new file mode 100644 index 00000000..8b7bd0cb --- /dev/null +++ b/images/remote-branches-4.svg @@ -0,0 +1,113 @@ + + + + + + image/svg+xml + + images/remote-branches-4 + + + + + images/remote-branches-4 + Created with Sketch. + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + master + + + + + + origin/master + + + + My Computer + git remote add teamone git://git.team1.ourcompany.com + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + git.ourcompany.com + origin + + + + f4265 + + + + + 31b8e + + + + + + master + + + + git.team1.ourcompany.com + teamone + + diff --git a/images/remote-branches-5.png b/images/remote-branches-5.png index be228239..cad3fe64 100644 Binary files a/images/remote-branches-5.png and b/images/remote-branches-5.png differ diff --git a/images/remote-branches-5.svg b/images/remote-branches-5.svg new file mode 100644 index 00000000..0ba0a047 --- /dev/null +++ b/images/remote-branches-5.svg @@ -0,0 +1,127 @@ + + + + + + image/svg+xml + + images/remote-branches-5 + + + + + images/remote-branches-5 + Created with Sketch. + + + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + + + + + teamone/master + + + + My Computer + git fetch teamone + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + + git.ourcompany.com + origin + + + + + f4265 + + + + + 31b8e + + + + + + master + + + + + git.team1.ourcompany.com + teamone + + diff --git a/images/replace1.png b/images/replace1.png index f5a23f7f..fb24e911 100644 Binary files a/images/replace1.png and b/images/replace1.png differ diff --git a/images/replace1.svg b/images/replace1.svg new file mode 100644 index 00000000..7475392d --- /dev/null +++ b/images/replace1.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + images/replace1 + + + + + images/replace1 + Created with Sketch. + + + + + ef989 + fifth + + + + c6e1e + fourth + + + + + 9c68f + third + + + + + 94570 + second + + + + + c1822 + first + + + + + + master + + + + diff --git a/images/replace2.png b/images/replace2.png index 5b03076c..ae3b0a34 100644 Binary files a/images/replace2.png and b/images/replace2.png differ diff --git a/images/replace2.svg b/images/replace2.svg new file mode 100644 index 00000000..30410b0e --- /dev/null +++ b/images/replace2.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/replace2 + + + + + images/replace2 + Created with Sketch. + + + + + ef989 + fifth + + + + + + c6e1e + fourth + + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + + + master + + + + + + + history + + + + diff --git a/images/replace3.png b/images/replace3.png index 5c3191cd..da5469fe 100644 Binary files a/images/replace3.png and b/images/replace3.png differ diff --git a/images/replace3.svg b/images/replace3.svg new file mode 100644 index 00000000..193ac798 --- /dev/null +++ b/images/replace3.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + images/replace3 + + + + + images/replace3 + Created with Sketch. + + + + + 622e8 + instructions + + + + + + c6e1e + fourth + + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + + + history + + + + + + + ef989 + fifth + + + + + + master + + + + + + diff --git a/images/replace4.png b/images/replace4.png index 553820c0..22d456da 100644 Binary files a/images/replace4.png and b/images/replace4.png differ diff --git a/images/replace4.svg b/images/replace4.svg new file mode 100644 index 00000000..9181110f --- /dev/null +++ b/images/replace4.svg @@ -0,0 +1,95 @@ + + + + + + image/svg+xml + + images/replace4 + + + + + images/replace4 + Created with Sketch. + + + + + + + rebase + + + + + + + + ef989 + fifth + + + + + + + master + + + + + + + e146b + fifth + + + + + c6e1e + fourth + + + + + + + history + + + + + + + 81a70 + fourth + + + + + 622e8 + instructions + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + diff --git a/images/replace5.png b/images/replace5.png index 41e7cd7b..f4b49ec9 100644 Binary files a/images/replace5.png and b/images/replace5.png differ diff --git a/images/replace5.svg b/images/replace5.svg new file mode 100644 index 00000000..dae52b66 --- /dev/null +++ b/images/replace5.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + images/replace5 + + + + + images/replace5 + Created with Sketch. + + + + + + + master + + + + + + + e146b + fifth + + + + + replace + + + + + + + 81a70 + fourth + + + + + 622e8 + instructions + + + + + + + + c6e1e + fourth + + + + + + + history + + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + + + + diff --git a/images/rerere1.png b/images/rerere1.png index 34ab3b7b..33386cd2 100644 Binary files a/images/rerere1.png and b/images/rerere1.png differ diff --git a/images/rerere1.svg b/images/rerere1.svg new file mode 100644 index 00000000..19b597d8 --- /dev/null +++ b/images/rerere1.svg @@ -0,0 +1,52 @@ + + + + + + image/svg+xml + + images/rerere1 + + + + + images/rerere1 + Created with Sketch. + + + + + + master + + + + + + + hello world + + + + + + + hola world + + + + + + + hello mundo + + + + + + + i18-world + + + + diff --git a/images/rerere2.png b/images/rerere2.png index 85dd47f4..da2f88c5 100644 Binary files a/images/rerere2.png and b/images/rerere2.png differ diff --git a/images/rerere2.svg b/images/rerere2.svg new file mode 100644 index 00000000..041e2685 --- /dev/null +++ b/images/rerere2.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + images/rerere2 + + + + + images/rerere2 + Created with Sketch. + + + + + + + hello world + + + + + + + hola world + + + + + + + + hola mundo + + + + + hello mundo + + + + + + + + rerere cache + + + + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ + + + + + + + master + + + + + + + i18-world + + + + + diff --git a/images/rerere3.png b/images/rerere3.png index b299ac74..d20f7a05 100644 Binary files a/images/rerere3.png and b/images/rerere3.png differ diff --git a/images/rerere3.svg b/images/rerere3.svg new file mode 100644 index 00000000..61bd3427 --- /dev/null +++ b/images/rerere3.svg @@ -0,0 +1,123 @@ + + + + + + image/svg+xml + + images/rerere3 + + + + + images/rerere3 + Created with Sketch. + + + + + + + + + + + + + hello world + + + + + + + hola world + + + + + + + master + + + + + + + + rebase + + + + + hello mundo + + + + + + + + + + hola mundo + + + + + + rerere cache + + + + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ + + + + + + + i18-world + + + + + diff --git a/images/reset-checkout.png b/images/reset-checkout.png index fe036345..72e7c7f0 100644 Binary files a/images/reset-checkout.png and b/images/reset-checkout.png differ diff --git a/images/reset-checkout.svg b/images/reset-checkout.svg new file mode 100644 index 00000000..c7f619e5 --- /dev/null +++ b/images/reset-checkout.svg @@ -0,0 +1,118 @@ + + + + + + image/svg+xml + + images/reset-checkout + + + + + images/reset-checkout + Created with Sketch. + + before command + + + commit A + + + + + commit B + + + + + master + + + + + + + develop + + + + + + + HEAD + + + + + + + commit A + + + + + + commit B + + + + + + + HEAD + + + + + + + master + + + + + + + develop + + + + after reset + + + after checkout + + + + commit A + + + + + commit B + + + + + + master + + + + + + + develop + + + + + + + HEAD + + + + + diff --git a/images/reset-ex1.png b/images/reset-ex1.png index 2ffd68b2..f08aa941 100644 Binary files a/images/reset-ex1.png and b/images/reset-ex1.png differ diff --git a/images/reset-ex1.svg b/images/reset-ex1.svg new file mode 100644 index 00000000..768227f3 --- /dev/null +++ b/images/reset-ex1.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + images/reset-ex1 + + + + + images/reset-ex1 + Created with Sketch. + + + + + + Index + + + + + + + + HEAD + + + + ? + + Git Repository + + + + + + file.txtv1 + + + + + + WorkingDirectory + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-ex2.png b/images/reset-ex2.png index f4ffd2a7..e6c6aa2b 100644 Binary files a/images/reset-ex2.png and b/images/reset-ex2.png differ diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg new file mode 100644 index 00000000..9ba054f2 --- /dev/null +++ b/images/reset-ex2.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + images/reset-ex2 + + + + + images/reset-ex2 + Created with Sketch. + + + + + + + HEAD + + + + + git add + + + + + file.txtv1 + + + + + + WorkingDirectory + + + + + + + + Index + + + + + file.txtv1 + + + ? + Git Repository + + + + + + HEAD + + + + master + + + + + diff --git a/images/reset-ex3.png b/images/reset-ex3.png index 74274933..07a6c91a 100644 Binary files a/images/reset-ex3.png and b/images/reset-ex3.png differ diff --git a/images/reset-ex3.svg b/images/reset-ex3.svg new file mode 100644 index 00000000..44c643a9 --- /dev/null +++ b/images/reset-ex3.svg @@ -0,0 +1,87 @@ + + + + + + image/svg+xml + + images/reset-ex3 + + + + + images/reset-ex3 + Created with Sketch. + + + + + + + + HEAD + + + + master + + + + Git Repository + git commit + + + + + file.txtv1 + + + + + + WorkingDirectory + + + + + + + + + HEAD + + + + eb43bf8 + + + file.txtv1 + + + + + + + + Index + + + + + file.txtv1 + + + + + + eb43bf8 + + + file.txtv1 + + + + + + + diff --git a/images/reset-ex4.png b/images/reset-ex4.png index 3cfbf7fc..8c4c01d1 100644 Binary files a/images/reset-ex4.png and b/images/reset-ex4.png differ diff --git a/images/reset-ex4.svg b/images/reset-ex4.svg new file mode 100644 index 00000000..6fa4a42c --- /dev/null +++ b/images/reset-ex4.svg @@ -0,0 +1,75 @@ + + + + + + image/svg+xml + + images/reset-ex4 + + + + + images/reset-ex4 + Created with Sketch. + + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + file.txtv1 + + edit file + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-ex5.png b/images/reset-ex5.png index c21a2534..bb03b1ac 100644 Binary files a/images/reset-ex5.png and b/images/reset-ex5.png differ diff --git a/images/reset-ex5.svg b/images/reset-ex5.svg new file mode 100644 index 00000000..fc7067d3 --- /dev/null +++ b/images/reset-ex5.svg @@ -0,0 +1,75 @@ + + + + + + image/svg+xml + + images/reset-ex5 + + + + + images/reset-ex5 + Created with Sketch. + + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + git add + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + file.txtv2 + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-ex6.png b/images/reset-ex6.png index c64cc38f..55d64c3a 100644 Binary files a/images/reset-ex6.png and b/images/reset-ex6.png differ diff --git a/images/reset-ex6.svg b/images/reset-ex6.svg new file mode 100644 index 00000000..4038dc11 --- /dev/null +++ b/images/reset-ex6.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/reset-ex6 + + + + + images/reset-ex6 + Created with Sketch. + + + Git Repository + git commit + + + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv2 + + + + 9e5e6a4 + + + + + + HEAD + + + + + + file.txtv2 + + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + + + + + HEAD + + + + master + + + diff --git a/images/reset-hard.png b/images/reset-hard.png index a9da7ced..c9668bb0 100644 Binary files a/images/reset-hard.png and b/images/reset-hard.png differ diff --git a/images/reset-hard.svg b/images/reset-hard.svg new file mode 100644 index 00000000..f5fe4271 --- /dev/null +++ b/images/reset-hard.svg @@ -0,0 +1,119 @@ + + + + + + image/svg+xml + + images/reset-hard + + + + + images/reset-hard + Created with Sketch. + + + + + + + HEAD + + + + master + + + + git reset --hard HEAD~ + + + 1 + + + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv2 + + + + 9e5e6a4 + + + + + + HEAD + + + + + + file.txtv2 + + + + 2 + + + + 3 + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + + diff --git a/images/reset-mixed.png b/images/reset-mixed.png index 0266fe51..15db7813 100644 Binary files a/images/reset-mixed.png and b/images/reset-mixed.png differ diff --git a/images/reset-mixed.svg b/images/reset-mixed.svg new file mode 100644 index 00000000..c65c0e19 --- /dev/null +++ b/images/reset-mixed.svg @@ -0,0 +1,113 @@ + + + + + + image/svg+xml + + images/reset-mixed + + + + + images/reset-mixed + Created with Sketch. + + git reset [--mixed] HEAD~ + + + + + HEAD + + + + master + + + + + + 1 + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv2 + + + + 9e5e6a4 + + + + + + HEAD + + + + + + file.txtv2 + + + + 2 + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + diff --git a/images/reset-path1.png b/images/reset-path1.png index 1672e02b..66929fb7 100644 Binary files a/images/reset-path1.png and b/images/reset-path1.png differ diff --git a/images/reset-path1.svg b/images/reset-path1.svg new file mode 100644 index 00000000..f4f774bd --- /dev/null +++ b/images/reset-path1.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + images/reset-path1 + + + + + images/reset-path1 + Created with Sketch. + + git reset file.txt + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + file.txtv1 + + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + + + HEAD + + + + master + + + + + diff --git a/images/reset-path2.png b/images/reset-path2.png index 08308e5e..d4106fd5 100644 Binary files a/images/reset-path2.png and b/images/reset-path2.png differ diff --git a/images/reset-path2.svg b/images/reset-path2.svg new file mode 100644 index 00000000..575e0d65 --- /dev/null +++ b/images/reset-path2.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + images/reset-path2 + + + + + images/reset-path2 + Created with Sketch. + + git add file.txt + + + + + + Index + + + + + + + + HEAD + + + + + Git Repository + + + file.txtv2 + + + + + + + + WorkingDirectory + + + + + file.txtv2 + + eb43bf8 + eb43bf8 + + + file.txtv1 + + + + file.txtv1 + + + + + + HEAD + + + + master + + + + + diff --git a/images/reset-path3.png b/images/reset-path3.png index e01f80ae..71e60b8c 100644 Binary files a/images/reset-path3.png and b/images/reset-path3.png differ diff --git a/images/reset-path3.svg b/images/reset-path3.svg new file mode 100644 index 00000000..9565e24f --- /dev/null +++ b/images/reset-path3.svg @@ -0,0 +1,107 @@ + + + + + + image/svg+xml + + images/reset-path3 + + + + + images/reset-path3 + Created with Sketch. + + + git reset eb43 -- file.txt + + + + + HEAD + + + + master + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + + 9e5e6a4 + + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv1 + + + + 38eb946 + + + + + + HEAD + + + + + + file.txtv3 + + + + + diff --git a/images/reset-soft.png b/images/reset-soft.png index 831d9f6f..b5098595 100644 Binary files a/images/reset-soft.png and b/images/reset-soft.png differ diff --git a/images/reset-soft.svg b/images/reset-soft.svg new file mode 100644 index 00000000..09fe219d --- /dev/null +++ b/images/reset-soft.svg @@ -0,0 +1,106 @@ + + + + + + image/svg+xml + + images/reset-soft + + + + + images/reset-soft + Created with Sketch. + + git reset --soft HEAD~ + + + + + + + + eb43bf8 + + + + file.txtv1 + + + + + 9e5e6a4 + + + + file.txtv2 + + + + 38eb946 + + + file.txtv3 + + + + Git Repository + + + + + + HEAD + + + + master + + + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + 9e5e6a4 + + + file.txtv2 + + + + + + + HEAD + + + + + + + + + + Index + + + + + file.txtv3 + + + diff --git a/images/reset-squash-r1.png b/images/reset-squash-r1.png index e703a309..b328fc23 100644 Binary files a/images/reset-squash-r1.png and b/images/reset-squash-r1.png differ diff --git a/images/reset-squash-r1.svg b/images/reset-squash-r1.svg new file mode 100644 index 00000000..7aa6bf2e --- /dev/null +++ b/images/reset-squash-r1.svg @@ -0,0 +1,132 @@ + + + + + + image/svg+xml + + images/reset-squash-r1 + + + + + images/reset-squash-r1 + Created with Sketch. + + Git Repository + + + + + + + HEAD + + + + master + + + + + + + + file-a.txt v1 + + eb43bf8 + + + + 9e5e6a4 + + + file-a.txt v2 + + + + file-b.txt v1 + + + + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + + + + + WorkingDirectory + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + Index + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + 38eb946 + + + + + + + HEAD + + + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + diff --git a/images/reset-squash-r2.png b/images/reset-squash-r2.png index 8b3bd443..61a24472 100644 Binary files a/images/reset-squash-r2.png and b/images/reset-squash-r2.png differ diff --git a/images/reset-squash-r2.svg b/images/reset-squash-r2.svg new file mode 100644 index 00000000..47859265 --- /dev/null +++ b/images/reset-squash-r2.svg @@ -0,0 +1,139 @@ + + + + + + image/svg+xml + + images/reset-squash-r2 + + + + + images/reset-squash-r2 + Created with Sketch. + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + git reset --soft HEAD~2 + + + Git Repository + + + + + file-a.txt v1 + + eb43bf8 + + + + + + 9e5e6a4 + + + file-a.txt v2 + + + + file-b.txt v1 + + + + + + + HEAD + + + + master + + + + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + + + + WorkingDirectory + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + Index + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + + HEAD + + + + + + file-a.txt v1 + + eb43bf8 + + + + diff --git a/images/reset-squash-r3.png b/images/reset-squash-r3.png index 87e44cbe..510e027a 100644 Binary files a/images/reset-squash-r3.png and b/images/reset-squash-r3.png differ diff --git a/images/reset-squash-r3.svg b/images/reset-squash-r3.svg new file mode 100644 index 00000000..144f0955 --- /dev/null +++ b/images/reset-squash-r3.svg @@ -0,0 +1,147 @@ + + + + + + image/svg+xml + + images/reset-squash-r3 + + + + + images/reset-squash-r3 + Created with Sketch. + + + git commit + + + + + + + Git Repository + + + + + file-a.txt v1 + + eb43bf8 + + + + 9e5e6a4 + + + file-a.txt v2 + + + + file-b.txt v1 + + + + + + + HEAD + + + + master + + + + + + + + + + WorkingDirectory + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + + Index + + + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + 68aef35 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + + + HEAD + + + + + + + 68aef35 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + + 38eb946 + + + + file-a.txt v3 + + + + file-b.txt v1 + + + + + diff --git a/images/reset-start.png b/images/reset-start.png index 70b3fb06..2d7b1523 100644 Binary files a/images/reset-start.png and b/images/reset-start.png differ diff --git a/images/reset-start.svg b/images/reset-start.svg new file mode 100644 index 00000000..38048142 --- /dev/null +++ b/images/reset-start.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/reset-start + + + + + images/reset-start + Created with Sketch. + + + + + + + eb43bf8 + + + file.txtv1 + + + + + 9e5e6a4 + + + file.txtv2 + + + + + 38eb946 + + + file.txtv3 + + + Git Repository + + + + + HEAD + + + + master + + + + + + file.txtv3 + + + + + + + + WorkingDirectory + + + + + + + + + Index + + + + + file.txtv3 + + + + 38eb946 + + + + + + HEAD + + + + + + file.txtv3 + + + + diff --git a/images/reset-workflow.png b/images/reset-workflow.png index 1c01e0d5..c741d4bd 100644 Binary files a/images/reset-workflow.png and b/images/reset-workflow.png differ diff --git a/images/reset-workflow.svg b/images/reset-workflow.svg new file mode 100644 index 00000000..35be798c --- /dev/null +++ b/images/reset-workflow.svg @@ -0,0 +1,48 @@ + + + + + + image/svg+xml + + images/reset-workflow + + + + + images/reset-workflow + Created with Sketch. + + + + + + + + + + Index + + + + HEAD + + + + WorkingDirectory + + + + Checkout the project + + + + Commit + + + + Stage Files + + + + diff --git a/images/small-team-1.png b/images/small-team-1.png index d13654ec..3dd5be18 100644 Binary files a/images/small-team-1.png and b/images/small-team-1.png differ diff --git a/images/small-team-1.svg b/images/small-team-1.svg new file mode 100644 index 00000000..e33ae1b1 --- /dev/null +++ b/images/small-team-1.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + images/small-team-1 + + + + + images/small-team-1 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 738ee + + + + + + + fbff5 + + + + + + + origin/master + + + + + + + master + + + + diff --git a/images/small-team-2.png b/images/small-team-2.png index 1af62787..f738c75b 100644 Binary files a/images/small-team-2.png and b/images/small-team-2.png differ diff --git a/images/small-team-2.svg b/images/small-team-2.svg new file mode 100644 index 00000000..78e7d23a --- /dev/null +++ b/images/small-team-2.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/small-team-2 + + + + + images/small-team-2 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + fbff5 + + + + + + + origin/master + + + + + + + master + + + + diff --git a/images/small-team-3.png b/images/small-team-3.png index 3b01de8b..31d0f726 100644 Binary files a/images/small-team-3.png and b/images/small-team-3.png differ diff --git a/images/small-team-3.svg b/images/small-team-3.svg new file mode 100644 index 00000000..1a2dbd42 --- /dev/null +++ b/images/small-team-3.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/small-team-3 + + + + + images/small-team-3 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + fbff5 + + + + + + + origin/master + + + + + + + master + + + + diff --git a/images/small-team-4.png b/images/small-team-4.png index b5e8c00b..a649b97e 100644 Binary files a/images/small-team-4.png and b/images/small-team-4.png differ diff --git a/images/small-team-4.svg b/images/small-team-4.svg new file mode 100644 index 00000000..3cd495ed --- /dev/null +++ b/images/small-team-4.svg @@ -0,0 +1,75 @@ + + + + + + image/svg+xml + + images/small-team-4 + + + + + images/small-team-4 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + fbff5 + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + master + + + + + + issue54 + + + + diff --git a/images/small-team-5.png b/images/small-team-5.png index e0215e4f..8219ac30 100644 Binary files a/images/small-team-5.png and b/images/small-team-5.png differ diff --git a/images/small-team-5.svg b/images/small-team-5.svg new file mode 100644 index 00000000..8279e682 --- /dev/null +++ b/images/small-team-5.svg @@ -0,0 +1,90 @@ + + + + + + image/svg+xml + + images/small-team-5 + + + + + images/small-team-5 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + fbff5 + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + + master + + + + + + + issue54 + + + + diff --git a/images/small-team-6.png b/images/small-team-6.png index 35794441..23bc4e1e 100644 Binary files a/images/small-team-6.png and b/images/small-team-6.png differ diff --git a/images/small-team-6.svg b/images/small-team-6.svg new file mode 100644 index 00000000..0c0804b7 --- /dev/null +++ b/images/small-team-6.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/small-team-6 + + + + + images/small-team-6 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + fbff5 + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + + 8059c + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + + master + + + + + + + issue54 + + + + diff --git a/images/small-team-7.png b/images/small-team-7.png index 6bbbc2d8..64ae230a 100644 Binary files a/images/small-team-7.png and b/images/small-team-7.png differ diff --git a/images/small-team-7.svg b/images/small-team-7.svg new file mode 100644 index 00000000..72607627 --- /dev/null +++ b/images/small-team-7.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + images/small-team-7 + + + + + images/small-team-7 + Created with Sketch. + + + + 4b078 + + + + + + 1edee + + + + + + + fbff5 + + + + + + + 738ee + + + + + + + + 72bbc + + + + + + + + 8059c + + + + + + + 8149a + + + + + + + 23ac6 + + + + + + + 4af42 + + + + + + + origin/master + + + + + + + master + + + + + + + issue54 + + + + diff --git a/images/small-team-flow.png b/images/small-team-flow.png index c8589ba6..12fe526f 100644 Binary files a/images/small-team-flow.png and b/images/small-team-flow.png differ diff --git a/images/small-team-flow.svg b/images/small-team-flow.svg new file mode 100644 index 00000000..93a805c1 --- /dev/null +++ b/images/small-team-flow.svg @@ -0,0 +1,400 @@ + + + + + + + + image/svg+xml + + images/small-team-flow + + + + + images/small-team-flow + Created with Sketch. + + + + + + Server + + + + + + John + + + + + + Jessica + + + + + + + git clone + + + git commit + + + git clone + + + + git fetch + + + + git push + + + + git push + + + + git push + + + + git fetch + + + + git fetch + + + + + git commit + + + + git merge + + + + git merge + + + + + + Server + + + + + + John + + + + + + Jessica + + + + diff --git a/images/smudge.png b/images/smudge.png index d86aa05c..7d4d84be 100644 Binary files a/images/smudge.png and b/images/smudge.png differ diff --git a/images/smudge.svg b/images/smudge.svg new file mode 100644 index 00000000..26b7f823 --- /dev/null +++ b/images/smudge.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + images/smudge + + + + + images/smudge + Created with Sketch. + + + + + fileA.txt + + + + + fileA.txt' + + + + fileB.txt' + + + + fileB.txt + + + + fileC.rb + + + + fileC.rb + + Staging Area + Working Directory + *.txt Filter + + + smudge + + + + clean + + + + + + + + + diff --git a/images/snapshots.png b/images/snapshots.png index 1036a424..0c9e0e28 100644 Binary files a/images/snapshots.png and b/images/snapshots.png differ diff --git a/images/snapshots.svg b/images/snapshots.svg new file mode 100644 index 00000000..f4af9c32 --- /dev/null +++ b/images/snapshots.svg @@ -0,0 +1,108 @@ + + + + + + image/svg+xml + + images/snapshots + + + + + images/snapshots + Created with Sketch. + + + + + + + + + Version 1 + + + + Version 2 + + + + Version 3 + + + + Version 4 + + + + Version 5 + + + + File A + + + + File A + + + + + A1 + + + + + C1 + + + + C2 + + + + B1 + + + + A2 + + + + A2 + + + + B2 + + + C3 + + + File B + + + + File C + + + Checkins Over Time + + + B + + + + A1 + + + + C2 + + + + B + + + diff --git a/images/symbols.svg b/images/symbols.svg new file mode 100644 index 00000000..164a1ebb --- /dev/null +++ b/images/symbols.svg @@ -0,0 +1,158 @@ + + + + images/symbols + Created with Sketch. + + + + + C6 + + + + + + v1.0 + + + + + + HEAD + + + + + + tree + + + + + + Version 5 + + + + + + integration + manager + + + + + + developer + public + + + + + + Staging + Area + + + + + + 9c68f + + + + + + c2b9e + + + + + + HEAD + + + + + + Working + Directory + + + + + + size + 92ec2 + Scott + Scott + + + commit + + tree + author + committer + + + The initial commit of my project + + + + + + size + 5b1d3 README + 911e7 LICENSE + cba0a test.rb + + + tree + + blob + blob + blob + + + + + + size + + + blob + + + == Testing library + + This library is used to test + Ruby projects. + + + + + + hello mundo + + + + + + fbff5 + + + + + + 738ee + + + + + + fba9a + + + + diff --git a/images/topic-branches-1.png b/images/topic-branches-1.png index 3bdca0dc..d7bb02b6 100644 Binary files a/images/topic-branches-1.png and b/images/topic-branches-1.png differ diff --git a/images/topic-branches-1.svg b/images/topic-branches-1.svg new file mode 100644 index 00000000..f181fbfa --- /dev/null +++ b/images/topic-branches-1.svg @@ -0,0 +1,102 @@ + + + + + + image/svg+xml + + images/topic-branches-1 + + + + + images/topic-branches-1 + Created with Sketch. + + + + C0 + + + + + C1 + + + + + C3 + + + + + C9 + + + + + C10 + + + + + C2 + + + + + C4 + + + + + C5 + + + + + C6 + + + + + C12 + + + + + C13 + + + + + C7 + + + + + C8 + + + + + C11 + + + + master + + + + iss91 + + + + iss91v2 + + + + dumbidea + + + diff --git a/images/topic-branches-2.png b/images/topic-branches-2.png index fe139d99..1d789a2f 100644 Binary files a/images/topic-branches-2.png and b/images/topic-branches-2.png differ diff --git a/images/topic-branches-2.svg b/images/topic-branches-2.svg new file mode 100644 index 00000000..a17db5e4 --- /dev/null +++ b/images/topic-branches-2.svg @@ -0,0 +1,118 @@ + + + + + + image/svg+xml + + images/topic-branches-2 + + + + + images/topic-branches-2 + Created with Sketch. + + + + C0 + + + + + + C1 + + + + + + + C3 + + + + + + + C9 + + + + + + + C10 + + + + + + + C2 + + + + + + + C4 + + + + + + + C13 + + + + + + + + C14 + + + + + + + C12 + + + + + master + + + + + + C7 + + + + + + + C8 + + + + + + + C11 + + + + + iss91v2 + + + + dumbidea + + + diff --git a/images/two-branches.png b/images/two-branches.png index aa6377a0..9cdbdccc 100644 Binary files a/images/two-branches.png and b/images/two-branches.png differ diff --git a/images/two-branches.svg b/images/two-branches.svg new file mode 100644 index 00000000..ded4572c --- /dev/null +++ b/images/two-branches.svg @@ -0,0 +1,51 @@ + + + + + + image/svg+xml + + images/two-branches + + + + + images/two-branches + Created with Sketch. + + + + + + master + + + + + + + testing + + + + + + + f30ab + + + + + + + + + 34ac2 + + + + + 98ca9 + + + diff --git a/images/undomerge-reset.png b/images/undomerge-reset.png index 3ffcc624..a0a3503c 100644 Binary files a/images/undomerge-reset.png and b/images/undomerge-reset.png differ diff --git a/images/undomerge-reset.svg b/images/undomerge-reset.svg new file mode 100644 index 00000000..e9a0f8ab --- /dev/null +++ b/images/undomerge-reset.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + images/undomerge-reset + + + + + images/undomerge-reset + Created with Sketch. + + + + C1 + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + + + M + + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-revert.png b/images/undomerge-revert.png index 87cd7c93..d84d717f 100644 Binary files a/images/undomerge-revert.png and b/images/undomerge-revert.png differ diff --git a/images/undomerge-revert.svg b/images/undomerge-revert.svg new file mode 100644 index 00000000..df81ae26 --- /dev/null +++ b/images/undomerge-revert.svg @@ -0,0 +1,88 @@ + + + + + + image/svg+xml + + images/undomerge-revert + + + + + images/undomerge-revert + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + + M + + + + + + ^M + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-revert2.png b/images/undomerge-revert2.png index dc5727ea..e93127f9 100644 Binary files a/images/undomerge-revert2.png and b/images/undomerge-revert2.png differ diff --git a/images/undomerge-revert2.svg b/images/undomerge-revert2.svg new file mode 100644 index 00000000..146d80eb --- /dev/null +++ b/images/undomerge-revert2.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + images/undomerge-revert2 + + + + + images/undomerge-revert2 + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + C7 + + + + + + C8 + + + + + + M + + + + + + ^M + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-revert3.png b/images/undomerge-revert3.png index 71f94a63..31206d15 100644 Binary files a/images/undomerge-revert3.png and b/images/undomerge-revert3.png differ diff --git a/images/undomerge-revert3.svg b/images/undomerge-revert3.svg new file mode 100644 index 00000000..7459de45 --- /dev/null +++ b/images/undomerge-revert3.svg @@ -0,0 +1,106 @@ + + + + + + image/svg+xml + + images/undomerge-revert3 + + + + + images/undomerge-revert3 + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + C7 + + + + + + ^^M + + + + + + + C8 + + + + + + M + + + + + + ^M + + + + + + + master + + + + + + + HEAD + + + + + + + + topic + + + + diff --git a/images/undomerge-start.png b/images/undomerge-start.png index 518a71d8..8d286fab 100644 Binary files a/images/undomerge-start.png and b/images/undomerge-start.png differ diff --git a/images/undomerge-start.svg b/images/undomerge-start.svg new file mode 100644 index 00000000..8a9e3bb0 --- /dev/null +++ b/images/undomerge-start.svg @@ -0,0 +1,79 @@ + + + + + + image/svg+xml + + images/undomerge-start + + + + + images/undomerge-start + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + M + + + + + + master + + + + + + + HEAD + + + + + + + topic + + + +