From 3cc6b4a72e4e706b7e702722c318ab9ed9bd200d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Thu, 8 Aug 2019 22:40:00 +0200 Subject: [PATCH 01/23] filtered_svg --- images/advance-master.svg | 68 +++++----- images/advance-testing.svg | 60 ++++----- images/areas.svg | 42 +++---- images/basic-branching-1.svg | 36 +++--- images/basic-branching-2.svg | 44 +++---- images/basic-branching-3.svg | 52 ++++---- images/basic-branching-4.svg | 68 +++++----- images/basic-branching-5.svg | 68 +++++----- images/basic-branching-6.svg | 68 +++++----- images/basic-merging-1.svg | 68 +++++----- images/basic-merging-2.svg | 78 ++++++------ images/basic-rebase-1.svg | 60 ++++----- images/basic-rebase-2.svg | 70 +++++------ images/basic-rebase-3.svg | 68 +++++----- images/basic-rebase-4.svg | 60 ++++----- images/benevolent-dictator.svg | 78 ++++++------ images/branch-and-history.svg | 76 ++++++------ images/centralized.svg | 38 +++--- images/checkout-master.svg | 62 ++++----- images/clean.svg | 66 +++++----- images/commit-and-tree.svg | 70 +++++------ images/commits-and-parents.svg | 134 ++++++++++---------- images/data-model-1.svg | 68 +++++----- images/data-model-2.svg | 88 ++++++------- images/data-model-3.svg | 154 +++++++++++------------ images/data-model-4.svg | 170 ++++++++++++------------- images/deltas.svg | 122 +++++++++--------- images/distributed.svg | 130 +++++++++---------- images/double-dot.svg | 70 +++++------ images/head-to-master.svg | 52 ++++---- images/head-to-testing.svg | 52 ++++---- images/integration-manager.svg | 84 ++++++------- images/interesting-rebase-1.svg | 100 +++++++-------- images/interesting-rebase-2.svg | 116 ++++++++--------- images/interesting-rebase-3.svg | 100 +++++++-------- images/interesting-rebase-4.svg | 124 +++++++++--------- images/interesting-rebase-5.svg | 84 ++++++------- images/large-merges-1.svg | 148 +++++++++++----------- images/large-merges-2.svg | 214 ++++++++++++++++---------------- images/lifecycle.svg | 50 ++++---- images/local.svg | 52 ++++---- images/lr-branches-1.svg | 84 ++++++------- images/lr-branches-2.svg | 72 +++++------ images/managed-team-1.svg | 68 +++++----- images/managed-team-2.svg | 122 +++++++++--------- images/managed-team-3.svg | 142 ++++++++++----------- images/managed-team-flow.svg | 116 ++++++++--------- images/merging-workflows-1.svg | 84 ++++++------- images/merging-workflows-2.svg | 104 ++++++++-------- images/merging-workflows-3.svg | 68 +++++----- images/merging-workflows-4.svg | 78 ++++++------ images/merging-workflows-5.svg | 78 ++++++------ images/perils-of-rebasing-1.svg | 70 +++++------ images/perils-of-rebasing-2.svg | 132 ++++++++++---------- images/perils-of-rebasing-3.svg | 148 +++++++++++----------- images/perils-of-rebasing-4.svg | 158 +++++++++++------------ images/perils-of-rebasing-5.svg | 120 +++++++++--------- images/public-small-1.svg | 86 ++++++------- images/public-small-2.svg | 86 ++++++------- images/public-small-3.svg | 102 +++++++-------- images/rebasing-1.svg | 60 ++++----- images/rebasing-2.svg | 70 +++++------ images/remote-branches-1.svg | 100 +++++++-------- images/remote-branches-2.svg | 118 +++++++++--------- images/remote-branches-3.svg | 140 ++++++++++----------- images/remote-branches-4.svg | 162 ++++++++++++------------ images/remote-branches-5.svg | 172 ++++++++++++------------- images/replace1.svg | 52 ++++---- images/replace2.svg | 60 ++++----- images/replace3.svg | 58 ++++----- images/replace4.svg | 94 +++++++------- images/replace5.svg | 112 ++++++++--------- images/rerere1.svg | 50 ++++---- images/rerere2.svg | 76 ++++++------ images/rerere3.svg | 84 ++++++------- images/reset-checkout.svg | 124 +++++++++--------- images/reset-ex1.svg | 64 +++++----- images/reset-ex2.svg | 76 ++++++------ images/reset-ex3.svg | 98 +++++++-------- images/reset-ex4.svg | 98 +++++++-------- images/reset-ex5.svg | 98 +++++++-------- images/reset-ex6.svg | 114 ++++++++--------- images/reset-hard.svg | 148 +++++++++++----------- images/reset-mixed.svg | 142 ++++++++++----------- images/reset-path1.svg | 100 +++++++-------- images/reset-path2.svg | 100 +++++++-------- images/reset-path3.svg | 130 +++++++++---------- images/reset-soft.svg | 132 ++++++++++---------- images/reset-squash-r1.svg | 144 ++++++++++----------- images/reset-squash-r2.svg | 142 ++++++++++----------- images/reset-squash-r3.svg | 170 ++++++++++++------------- images/reset-start.svg | 126 +++++++++---------- images/reset-workflow.svg | 38 +++--- images/small-team-1.svg | 52 ++++---- images/small-team-2.svg | 62 ++++----- images/small-team-3.svg | 62 ++++----- images/small-team-4.svg | 76 ++++++------ images/small-team-5.svg | 94 +++++++------- images/small-team-6.svg | 104 ++++++++-------- images/small-team-7.svg | 104 ++++++++-------- images/small-team-flow.svg | 72 +++++------ images/smudge.svg | 78 ++++++------ images/snapshots.svg | 144 ++++++++++----------- images/symbols.svg | 182 +++++++++++++-------------- images/topic-branches-1.svg | 140 ++++++++++----------- images/topic-branches-2.svg | 128 +++++++++---------- images/two-branches.svg | 46 +++---- images/undomerge-reset.svg | 86 ++++++------- images/undomerge-revert.svg | 94 +++++++------- images/undomerge-revert2.svg | 112 ++++++++--------- images/undomerge-revert3.svg | 120 +++++++++--------- images/undomerge-start.svg | 86 ++++++------- 112 files changed, 5312 insertions(+), 5312 deletions(-) diff --git a/images/advance-master.svg b/images/advance-master.svg index 2241e33cc..4084151f7 100644 --- a/images/advance-master.svg +++ b/images/advance-master.svg @@ -1,63 +1,63 @@ - - + + images/advance-master Created with Sketch. - - - - + + + + - - - f30ab + + + f30ab - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - - - 87ab2 + + + 87ab2 - - - c2b9e + + + c2b9e - + - - - testing + + + testing - + - - - master + + + master - + - - - HEAD + + + HEAD - \ No newline at end of file + diff --git a/images/advance-testing.svg b/images/advance-testing.svg index 966c1d863..8bddf1809 100644 --- a/images/advance-testing.svg +++ b/images/advance-testing.svg @@ -1,56 +1,56 @@ - - + + images/advance-testing Created with Sketch. - - - - + + + + - - - master + + + master - - - f30ab + + + f30ab - - - 87ab2 + + + 87ab2 - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - + - - - testing + + + testing - + - - - HEAD + + + HEAD - \ No newline at end of file + diff --git a/images/areas.svg b/images/areas.svg index b51dacdc3..fdf3a9037 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -1,36 +1,36 @@ - - + + images/areas Created with Sketch. - - - + + + - - - Working - Directory + + + Working + Directory - - - Staging - Area + + + Staging + Area - - - .git directory - (Repository) + + + .git directory + (Repository) - - - + + + Checkout the project @@ -41,4 +41,4 @@ Commit - \ No newline at end of file + diff --git a/images/basic-branching-1.svg b/images/basic-branching-1.svg index f171d8f1f..c71fa0221 100644 --- a/images/basic-branching-1.svg +++ b/images/basic-branching-1.svg @@ -1,35 +1,35 @@ - - + + images/basic-branching-1 Created with Sketch. - - - C0 + + + C0 - - - + + + - - - C1 + + + C1 - - - C2 + + + C2 - - - master + + + master - \ No newline at end of file + diff --git a/images/basic-branching-2.svg b/images/basic-branching-2.svg index 5c2b7da53..198ce7a52 100644 --- a/images/basic-branching-2.svg +++ b/images/basic-branching-2.svg @@ -1,42 +1,42 @@ - - + + images/basic-branching-2 Created with Sketch. - - - C0 + + + C0 - - - - + + + + - - - C1 + + + C1 - - - C2 + + + C2 - - - master + + + master - - - iss53 + + + iss53 - \ No newline at end of file + diff --git a/images/basic-branching-3.svg b/images/basic-branching-3.svg index 1d2ed19c8..0830fbc75 100644 --- a/images/basic-branching-3.svg +++ b/images/basic-branching-3.svg @@ -1,51 +1,51 @@ - - + + images/basic-branching-3 Created with Sketch. - + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - - - C3 + + + C3 - - - + + + - - - master + + + master - + - - - iss53 + + + iss53 - \ No newline at end of file + diff --git a/images/basic-branching-4.svg b/images/basic-branching-4.svg index 191d26310..2fb653cd2 100644 --- a/images/basic-branching-4.svg +++ b/images/basic-branching-4.svg @@ -1,69 +1,69 @@ - - + + images/basic-branching-4 Created with Sketch. - - - + + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - - - master + + + master - + - + - - - hotfix + + + hotfix - - - C4 + + + C4 - - - C3 + + + C3 - + - - - iss53 + + + iss53 - \ No newline at end of file + diff --git a/images/basic-branching-5.svg b/images/basic-branching-5.svg index 268429d68..fec815f13 100644 --- a/images/basic-branching-5.svg +++ b/images/basic-branching-5.svg @@ -1,69 +1,69 @@ - - + + images/basic-branching-5 Created with Sketch. - - - + + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - - - master + + + master - + - + - - - hotfix + + + hotfix - - - C4 + + + C4 - - - C3 + + + C3 - + - - - iss53 + + + iss53 - \ No newline at end of file + diff --git a/images/basic-branching-6.svg b/images/basic-branching-6.svg index 41fd46293..bdc8c3773 100644 --- a/images/basic-branching-6.svg +++ b/images/basic-branching-6.svg @@ -1,69 +1,69 @@ - - + + images/basic-branching-6 Created with Sketch. - - - + + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - + - - - master + + + master - - - C4 + + + C4 - + - - - C5 + + + C5 - - - C3 + + + C3 - + - - - iss53 + + + iss53 - \ No newline at end of file + diff --git a/images/basic-merging-1.svg b/images/basic-merging-1.svg index b70dc9594..39de964e1 100644 --- a/images/basic-merging-1.svg +++ b/images/basic-merging-1.svg @@ -1,65 +1,65 @@ - - + + images/basic-merging-1 Created with Sketch. - - - + + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - + - - - master + + + master - - - C4 + + + C4 - + - - - C5 + + + C5 - - - C3 + + + C3 - + - - - iss53 + + + iss53 @@ -76,4 +76,4 @@ Ancestor - \ No newline at end of file + diff --git a/images/basic-merging-2.svg b/images/basic-merging-2.svg index 959ad9446..bfc23d459 100644 --- a/images/basic-merging-2.svg +++ b/images/basic-merging-2.svg @@ -1,77 +1,77 @@ - - + + images/basic-merging-2 Created with Sketch. - - - + + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - + - - - master + + + master - - - C4 + + + C4 - + - - - C5 + + + C5 - - + + - - - C6 + + + C6 - - - C3 + + + C3 - + - - - iss53 + + + iss53 - \ No newline at end of file + diff --git a/images/basic-rebase-1.svg b/images/basic-rebase-1.svg index 20a1a71e8..cc22bd894 100644 --- a/images/basic-rebase-1.svg +++ b/images/basic-rebase-1.svg @@ -1,62 +1,62 @@ - - + + images/basic-rebase-1 Created with Sketch. - - - + + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - + - - - experiment + + + experiment - - - C4 + + + C4 - - - C3 + + + C3 - + - - - master + + + master - \ No newline at end of file + diff --git a/images/basic-rebase-2.svg b/images/basic-rebase-2.svg index 2c04e1873..4ea51d14d 100644 --- a/images/basic-rebase-2.svg +++ b/images/basic-rebase-2.svg @@ -1,70 +1,70 @@ - - + + images/basic-rebase-2 Created with Sketch. - - + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - - + + - + - - - experiment + + + experiment - - - C4 + + + C4 - + - - - C3 + + + C3 - + - - - C5 + + + C5 - + - - - master + + + master - \ No newline at end of file + diff --git a/images/basic-rebase-3.svg b/images/basic-rebase-3.svg index e76264dfe..415f7f63e 100644 --- a/images/basic-rebase-3.svg +++ b/images/basic-rebase-3.svg @@ -1,71 +1,71 @@ - - + + images/basic-rebase-3 Created with Sketch. - - + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - - - experiment + + + experiment - + - - - C4 + + + C4 - + - - - C3 + + + C3 - + - - - C4' + + + C4' - + - - - master + + + master - \ No newline at end of file + diff --git a/images/basic-rebase-4.svg b/images/basic-rebase-4.svg index e39a7e278..568689932 100644 --- a/images/basic-rebase-4.svg +++ b/images/basic-rebase-4.svg @@ -1,62 +1,62 @@ - - + + images/basic-rebase-4 Created with Sketch. - - + + - - - C0 + + + C0 - - - C1 + + + C1 - - - C2 + + + C2 - + - - - experiment + + + experiment - + - - - C3 + + + C3 - + - - - C4' + + + C4' - + - - - master + + + master - \ No newline at end of file + diff --git a/images/benevolent-dictator.svg b/images/benevolent-dictator.svg index 4003edd0d..48001f2a4 100644 --- a/images/benevolent-dictator.svg +++ b/images/benevolent-dictator.svg @@ -1,67 +1,67 @@ - - + + images/benevolent-dictator Created with Sketch. - - - blessed - repository + + + blessed + repository - - - lieutenant + + + lieutenant - - - lieutenant + + + lieutenant - - - developer - public + + + developer + public - - - developer - public + + + developer + public - - - developer - public + + + developer + public - - - - - - - - - - - + + + + + + + + + + + - - - dictator + + + dictator - \ No newline at end of file + diff --git a/images/branch-and-history.svg b/images/branch-and-history.svg index fe56e05d2..0206e55a6 100644 --- a/images/branch-and-history.svg +++ b/images/branch-and-history.svg @@ -1,70 +1,70 @@ - - + + images/branch-and-history Created with Sketch. - + - - - Snapshot C + + + Snapshot C - + - - - Snapshot B + + + Snapshot B - + - - - Snapshot A + + + Snapshot A - - - f30ab + + + f30ab - - - + + + - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - - + + - - - master + + + master - - - HEAD + + + HEAD - - - v1.0 + + + v1.0 - \ No newline at end of file + diff --git a/images/centralized.svg b/images/centralized.svg index 0bfc1e202..a7560ac8e 100644 --- a/images/centralized.svg +++ b/images/centralized.svg @@ -1,38 +1,38 @@ - - + + images/centralized Created with Sketch. - - - shared - repository + + + shared + repository - - - developer + + + developer - - - developer + + + developer - - - developer + + + developer - - - + + + - \ No newline at end of file + diff --git a/images/checkout-master.svg b/images/checkout-master.svg index e41b521f7..970719553 100644 --- a/images/checkout-master.svg +++ b/images/checkout-master.svg @@ -1,57 +1,57 @@ - - + + images/checkout-master Created with Sketch. - - - - + + + + - - - master + + + master - - - f30ab + + + f30ab - - - 87ab2 + + + 87ab2 - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - + - - - testing + + + testing - - + + - - - HEAD + + + HEAD - \ No newline at end of file + diff --git a/images/clean.svg b/images/clean.svg index 8a11a8a93..e56226ed2 100644 --- a/images/clean.svg +++ b/images/clean.svg @@ -1,45 +1,45 @@ - - + + images/clean Created with Sketch. - - - fileA.txt + + + fileA.txt - + - - - fileA.txt' + + + fileA.txt' - - - fileB.txt' + + + fileB.txt' - - - fileB.txt + + + fileB.txt - - - fileC.rb + + + fileC.rb - - - fileC.rb + + + fileC.rb @@ -52,22 +52,22 @@ *.txt Filter - - - smudge + + + smudge - - - clean + + + clean - - - - - + + + + + - \ No newline at end of file + diff --git a/images/commit-and-tree.svg b/images/commit-and-tree.svg index e70c16356..4a28a98e5 100644 --- a/images/commit-and-tree.svg +++ b/images/commit-and-tree.svg @@ -1,89 +1,89 @@ - - + + images/commit-and-tree Created with Sketch. - - + + size 92ec2 Scott Scott - + commit tree author committer - - The initial commit of my project + + 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. - - + + size - + blob - + The MIT License - + Copyright (c) 2008 Scott Chacon - + Permission is hereby granted, free of charge, to any person - - - size + + + size - - blob + + blob - + require 'logger' require 'test/unit' - - + + class Test::Unit::TestCase @@ -103,9 +103,9 @@ cba0a - - - - + + + + - \ No newline at end of file + diff --git a/images/commits-and-parents.svg b/images/commits-and-parents.svg index 96f10bfe4..1e760a25d 100644 --- a/images/commits-and-parents.svg +++ b/images/commits-and-parents.svg @@ -1,105 +1,105 @@ - - + + images/commits-and-parents Created with Sketch. - - - size - 92ec2 - - Scott - Scott + + + size + 92ec2 + + Scott + Scott - - commit - - tree - parent - author - committer + + commit + + tree + parent + author + committer - - The initial commit of my project + + The initial commit of my project - - - Snapshot A + + + Snapshot A - + - - - size - 184ca - 98ca9 - Scott - Scott + + + size + 184ca + 98ca9 + Scott + Scott - - commit - - tree - parent - author - committer + + commit + + tree + parent + author + committer - - Fixed bug #1328 - stack overflow - under certain conditions + + Fixed bug #1328 - stack overflow + under certain conditions - - - Snapshot B + + + Snapshot B - + 98ca9 34ac2 - + - - - size - 0de24 - 34ac2 - Scott - Scott + + + size + 0de24 + 34ac2 + Scott + Scott - - commit - - tree - parent - author - committer + + commit + + tree + parent + author + committer - - add feature #32 - ability to add new - formats to the central interface + + add feature #32 - ability to add new + formats to the central interface - - - Snapshot C + + + Snapshot C - + f30ab - + - \ No newline at end of file + diff --git a/images/data-model-1.svg b/images/data-model-1.svg index ae62c1263..8f1966802 100644 --- a/images/data-model-1.svg +++ b/images/data-model-1.svg @@ -1,66 +1,66 @@ - - + + images/data-model-1 Created with Sketch. - - - blob + + + blob - - - blob + + + blob - - - blob + + + blob - - - - + + + + - - - simplegit.rb + + + simplegit.rb - - - Rakefile + + + Rakefile - - - README + + + README - - - lib + + + lib - - - tree + + + tree - - - tree + + + tree - \ No newline at end of file + diff --git a/images/data-model-2.svg b/images/data-model-2.svg index 3148c2556..3474d727c 100644 --- a/images/data-model-2.svg +++ b/images/data-model-2.svg @@ -1,81 +1,81 @@ - - + + images/data-model-2 Created with Sketch. - - - "version 2" + + + "version 2" - - 1f7a7a + + 1f7a7a - - - "new file" + + + "new file" - - fa49b0 + + fa49b0 - - - "version 1" + + + "version 1" - - 83baae + + 83baae - - - - + + + + - - - test.txt + + + test.txt - - - test.txt + + + test.txt - - - new.txt + + + new.txt - - - bak + + + bak - - - tree + + + tree - - 3c4e9c + + 3c4e9c - - - tree + + + tree - - d8329f + + d8329f - \ No newline at end of file + diff --git a/images/data-model-3.svg b/images/data-model-3.svg index a713a56c3..7ddc523c0 100644 --- a/images/data-model-3.svg +++ b/images/data-model-3.svg @@ -1,136 +1,136 @@ - - + + images/data-model-3 Created with Sketch. - - - - - - - - - + + + + + + + + + - - - "version 2" + + + "version 2" - - 1f7a7a + + 1f7a7a - - - "new file" + + + "new file" - - fa49b0 + + fa49b0 - - - "version 1" + + + "version 1" - - 83baae + + 83baae - - - test.txt + + + test.txt - - - test.txt + + + test.txt - - - test.txt + + + test.txt - - - new.txt + + + new.txt - - - new.txt + + + new.txt - - - bak + + + bak - - - tree + + + tree - - 3c4e9c + + 3c4e9c - - - third commit + + + third commit - - 1a410e + + 1a410e - + - - - second commit + + + second commit - - cac0ca + + cac0ca - + - - - first commit + + + first commit - - fdf4fc + + fdf4fc - - - tree + + + tree - - 0155eb + + 0155eb - - - tree + + + tree - - d8329f + + d8329f - \ No newline at end of file + diff --git a/images/data-model-4.svg b/images/data-model-4.svg index ddebe9cda..30f7ba26b 100644 --- a/images/data-model-4.svg +++ b/images/data-model-4.svg @@ -1,154 +1,154 @@ - - + + images/data-model-4 Created with Sketch. - - - - - - - - - + + + + + + + + + - - - "version 2" + + + "version 2" - - 1f7a7a + + 1f7a7a - - - "new file" + + + "new file" - - fa49b0 + + fa49b0 - - - "version 1" + + + "version 1" - - 83baae + + 83baae - - - test.txt + + + test.txt - - - test.txt + + + test.txt - - - test.txt + + + test.txt - - - new.txt + + + new.txt - - - new.txt + + + new.txt - - - bak + + + bak - - - tree + + + tree - - 3c4e9c + + 3c4e9c - - - third commit + + + third commit - - 1a410e + + 1a410e - + - - - second commit + + + second commit - - cac0ca + + cac0ca - + - - - first commit + + + first commit - - fdf4fc + + fdf4fc - + - - - refs/heads/test + + + refs/heads/test - + - - - refs/heads/master + + + refs/heads/master - - - tree + + + tree - - 0155eb + + 0155eb - - - tree + + + tree - - d8329f + + d8329f - \ No newline at end of file + diff --git a/images/deltas.svg b/images/deltas.svg index 485878a01..cf363ccdc 100644 --- a/images/deltas.svg +++ b/images/deltas.svg @@ -1,117 +1,117 @@ - - + + images/deltas Created with Sketch. - - - Version 1 + + + Version 1 - - - Version 2 + + + Version 2 - - - Version 3 + + + Version 3 - - - Version 4 + + + Version 4 - - - Version 5 + + + Version 5 - - - File A + + + File A - - - File A + + + File A - - - Δ1 + + + Δ1 - - - Δ1 + + + Δ1 - - - Δ2 + + + Δ2 - - - Δ1 + + + Δ1 - - - Δ2 + + + Δ2 - - - Δ2 + + + Δ2 - - - Δ3 + + + Δ3 - - - File B + + + File B - - - File C - - - - - - - - - - + + + File C + + + + + + + + + + Checkins Over Time - \ No newline at end of file + diff --git a/images/distributed.svg b/images/distributed.svg index b0f7110d0..e3fec05bd 100644 --- a/images/distributed.svg +++ b/images/distributed.svg @@ -1,117 +1,117 @@ - - + + images/distributed Created with Sketch. - - - - Version Database + + + + Version Database - - - Version 3 + + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - - - - Server Computer + + + + Server Computer - + - - - Version Database + + + Version Database - - - Version 3 + + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - - + + - - Computer A + + Computer A - - - File + + + File - + - + - - - Version Database + + + Version Database - - - Version 3 + + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - - + + - - Computer B + + Computer B - - - File + + + File - + - - - + + + - \ No newline at end of file + diff --git a/images/double-dot.svg b/images/double-dot.svg index 535083f0c..94acce124 100644 --- a/images/double-dot.svg +++ b/images/double-dot.svg @@ -1,78 +1,78 @@ - - + + images/double-dot Created with Sketch. - - - A + + + A - + - - - B + + + B - + - - - E + + + E - - + + - - - F + + + F - + - - - C + + + C - + - - - D + + + D - + - - - master + + + master - + - - - experiment + + + experiment - \ No newline at end of file + diff --git a/images/head-to-master.svg b/images/head-to-master.svg index 51d09cfe2..4678fba80 100644 --- a/images/head-to-master.svg +++ b/images/head-to-master.svg @@ -1,49 +1,49 @@ - - + + images/head-to-master Created with Sketch. - - - - - + + + + + - - - master + + + master - - - testing + + + testing - - - f30ab + + + f30ab - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - - - HEAD + + + HEAD - \ No newline at end of file + diff --git a/images/head-to-testing.svg b/images/head-to-testing.svg index a2805ee35..309cb4d9c 100644 --- a/images/head-to-testing.svg +++ b/images/head-to-testing.svg @@ -1,49 +1,49 @@ - - + + images/head-to-testing Created with Sketch. - - - - + + + + - - - master + + + master - - - testing + + + testing - - - f30ab + + + f30ab - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - + - - - HEAD + + + HEAD - \ No newline at end of file + diff --git a/images/integration-manager.svg b/images/integration-manager.svg index 342cb16e2..678452133 100644 --- a/images/integration-manager.svg +++ b/images/integration-manager.svg @@ -1,77 +1,77 @@ - - + + images/integration-manager Created with Sketch. - - - blessed - repository + + + blessed + repository - - - integration - manager + + + integration + manager - - - developer - public + + + developer + public - - - developer - private + + + developer + private - - - developer - public + + + developer + public - - - developer - private + + + developer + private - + - - - - - + + + + + - - - developer - public + + + developer + public - - - developer - private + + + developer + private - + - \ No newline at end of file + diff --git a/images/interesting-rebase-1.svg b/images/interesting-rebase-1.svg index 0a086fc16..e25b9e0d5 100644 --- a/images/interesting-rebase-1.svg +++ b/images/interesting-rebase-1.svg @@ -1,105 +1,105 @@ - - + + images/interesting-rebase-1 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - master + + + master - + - - - C6 + + + C6 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C8 + + + C8 - + - - - C9 + + + C9 - + - - - C10 + + + C10 - + - - - server + + + server - + - - - client + + + client - \ No newline at end of file + diff --git a/images/interesting-rebase-2.svg b/images/interesting-rebase-2.svg index 34603ef3b..ba9f8b1de 100644 --- a/images/interesting-rebase-2.svg +++ b/images/interesting-rebase-2.svg @@ -1,123 +1,123 @@ - - + + images/interesting-rebase-2 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - master + + + master - + - - - C6 + + + C6 - + - - - C8' + + + C8' - + - - - C9' + + + C9' - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C8 + + + C8 - + - - - C9 + + + C9 - + - - - C10 + + + C10 - + - - - server + + + server - + - - - client + + + client - \ No newline at end of file + diff --git a/images/interesting-rebase-3.svg b/images/interesting-rebase-3.svg index 61fc804e6..be8b64f9b 100644 --- a/images/interesting-rebase-3.svg +++ b/images/interesting-rebase-3.svg @@ -1,107 +1,107 @@ - - + + images/interesting-rebase-3 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - master + + + master - + - - - C6 + + + C6 - + - - - C8' + + + C8' - + - - - C9' + + + C9' - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C10 + + + C10 - + - - - server + + + server - + - - - client + + + client - \ No newline at end of file + diff --git a/images/interesting-rebase-4.svg b/images/interesting-rebase-4.svg index 6d712b653..5c4572e37 100644 --- a/images/interesting-rebase-4.svg +++ b/images/interesting-rebase-4.svg @@ -1,134 +1,134 @@ - - + + images/interesting-rebase-4 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - master + + + master - + - - - C6 + + + C6 - + - - - C8' + + + C8' - + - - - C9' + + + C9' - + - - - C3' + + + C3' - + - - - C4' + + + C4' - + - - - C10' + + + C10' - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C10 + + + C10 - + - - - server + + + server - + - - - client + + + client - \ No newline at end of file + diff --git a/images/interesting-rebase-5.svg b/images/interesting-rebase-5.svg index 075b1445e..bdd155e72 100644 --- a/images/interesting-rebase-5.svg +++ b/images/interesting-rebase-5.svg @@ -1,91 +1,91 @@ - - + + images/interesting-rebase-5 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - master + + + master - + - - - C6 + + + C6 - + - - - C8' + + + C8' - + - - - C9' + + + C9' - + - - - C3' + + + C3' - + - - - C4' + + + C4' - + - - - C10' + + + C10' - \ No newline at end of file + diff --git a/images/large-merges-1.svg b/images/large-merges-1.svg index 499c0cb70..c34c0d0de 100644 --- a/images/large-merges-1.svg +++ b/images/large-merges-1.svg @@ -1,155 +1,155 @@ - - + + images/large-merges-1 Created with Sketch. - + - - - master + + + master - + - - - tv/rebase-stat + + + tv/rebase-stat - + - - - jk/clone-checkout + + + jk/clone-checkout - + - - - db/push-cleanup + + + db/push-cleanup - + - - - js/notes + + + js/notes - + - - - ps/blame + + + ps/blame - - - C1 + + + C1 - + - - - C2 + + + C2 - - - - - + + + + + - - - C3 + + + C3 - - - C5 + + + C5 - - - C7 + + + C7 - - - C9 + + + C9 - - - C11 + + + C11 - + - - - C4 + + + C4 - + - - - C6 + + + C6 - + - - - C8 + + + C8 - + - - - C10 + + + C10 - + - - - C12 + + + C12 - \ No newline at end of file + diff --git a/images/large-merges-2.svg b/images/large-merges-2.svg index e3d4811db..3d449a886 100644 --- a/images/large-merges-2.svg +++ b/images/large-merges-2.svg @@ -1,213 +1,213 @@ - - + + images/large-merges-2 Created with Sketch. - + - - - master + + + master - + - - - tv/rebase-stat + + + tv/rebase-stat - + - - - jk/clone-checkout + + + jk/clone-checkout - + - - - db/push-cleanup + + + db/push-cleanup - + - - - js/notes + + + js/notes - + - - - pu + + + pu - + - - - next + + + next - + - - - ps/blame + + + ps/blame - - - C1 + + + C1 - + - - - C2 + + + C2 - - - - - - - - - + + + + + + + + + - - - C3 + + + C3 - - - C5 + + + C5 - - - C7 + + + C7 - - - C9 + + + C9 - - - C11 + + + C11 - + - - - C4 + + + C4 - + - - - C16 + + + C16 - + - - - C17 + + + C17 - + - - - C13 + + + C13 - + - - - C14 + + + C14 - + - - - C15 + + + C15 - + - - - C6 + + + C6 - + - - - C8 + + + C8 - + - - - C10 + + + C10 - + - - - C12 + + + C12 - + - \ No newline at end of file + diff --git a/images/lifecycle.svg b/images/lifecycle.svg index 8aa77143c..44516aa26 100644 --- a/images/lifecycle.svg +++ b/images/lifecycle.svg @@ -1,27 +1,27 @@ - - + + images/lifecycle Created with Sketch. - + - - - - + + + + - - - Modified + + + Modified - - - - - + + + + + Edit the file @@ -35,25 +35,25 @@ Stage the file - - - Untracked + + + Untracked - - - Unmodified + + + Unmodified Commit - - - Staged + + + Staged - \ No newline at end of file + diff --git a/images/local.svg b/images/local.svg index eb6b54ed9..de06b1d86 100644 --- a/images/local.svg +++ b/images/local.svg @@ -1,48 +1,48 @@ - - + + images/local Created with Sketch. - - - Local Computer + + + Local Computer - - - Version Database + + + Version Database - - Checkout + + Checkout - - - File + + + File - - - Version 3 + + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - - - + + + - \ No newline at end of file + diff --git a/images/lr-branches-1.svg b/images/lr-branches-1.svg index abf9193c3..1dd08f711 100644 --- a/images/lr-branches-1.svg +++ b/images/lr-branches-1.svg @@ -1,77 +1,77 @@ - - + + images/lr-branches-1 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - C7 + + + C7 - + - - - master + + + master - + - - - develop + + + develop - + - - - topic + + + topic - \ No newline at end of file + diff --git a/images/lr-branches-2.svg b/images/lr-branches-2.svg index 7786bbf00..1a5296921 100644 --- a/images/lr-branches-2.svg +++ b/images/lr-branches-2.svg @@ -1,63 +1,63 @@ - - + + images/lr-branches-2 Created with Sketch. - - - + + + - - - + + + - - - C1 + + + C1 - - + + - - - C2 + + + C2 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C5 + + + C5 - - - C6 + + + C6 - + - - - C7 + + + C7 @@ -70,4 +70,4 @@ topic - \ No newline at end of file + diff --git a/images/managed-team-1.svg b/images/managed-team-1.svg index ea76001fa..fbb0a58fd 100644 --- a/images/managed-team-1.svg +++ b/images/managed-team-1.svg @@ -1,71 +1,71 @@ - - + + images/managed-team-1 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 33009 + + + 33009 - + - - - 85127 + + + 85127 - + - - - e5b0f + + + e5b0f - + - - - featureB + + + featureB - + - - - master + + + master - + - - - featureA + + + featureA - \ No newline at end of file + diff --git a/images/managed-team-2.svg b/images/managed-team-2.svg index 63bdaffce..c080d4221 100644 --- a/images/managed-team-2.svg +++ b/images/managed-team-2.svg @@ -1,130 +1,130 @@ - - + + images/managed-team-2 Created with Sketch. - + - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 33009 + + + 33009 - + - - - aad88 + + + aad88 - + - - - 774b3 + + + 774b3 - + - - - 85127 + + + 85127 - + - - - cd685 + + + cd685 - + - - - fba9a + + + fba9a - + - - - e5b0f + + + e5b0f - + - - - origin/ - featureBee + + + origin/ + featureBee - + - - - featureB + + + featureB - + - - - master + + + master - + - - - origin/ - featureA + + + origin/ + featureA - + - - - featureA + + + featureA - \ No newline at end of file + diff --git a/images/managed-team-3.svg b/images/managed-team-3.svg index a61fe790f..3af1b2519 100644 --- a/images/managed-team-3.svg +++ b/images/managed-team-3.svg @@ -1,150 +1,150 @@ - - + + images/managed-team-3 Created with Sketch. - - + + - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 33009 + + + 33009 - + - - - aad88 + + + aad88 - + - - - 774b3 + + + 774b3 - + - - - 5399e + + + 5399e - + - - - 85127 + + + 85127 - + - - - cd685 + + + cd685 - + - - - fba9a + + + fba9a - + - - - e5b0f + + + e5b0f - + - - - origin/ - featureBee + + + origin/ + featureBee - + - - - featureB + + + featureB - + - - - master + + + master - + - - - origin/ - featureA + + + origin/ + featureA - + - - - origin/ - master + + + origin/ + master - + - - - featureA + + + featureA - \ No newline at end of file + diff --git a/images/managed-team-flow.svg b/images/managed-team-flow.svg index 67a330929..e1638b816 100644 --- a/images/managed-team-flow.svg +++ b/images/managed-team-flow.svg @@ -1,79 +1,79 @@ - - + + images/managed-team-flow Created with Sketch. - - - Josie + + + Josie - + - - - Josie + + + Josie - - - John + + + John - + - - - John + + + John - - - Jessica + + + Jessica - + - - - Jessica + + + Jessica - + - - - server: - featureA + + + server: + featureA - - - server: - featureA + + + server: + featureA - + - - - server: - featureBee + + + server: + featureBee - - - server: - featureBee + + + server: + featureBee - + git commit (A) @@ -85,65 +85,65 @@ 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) - + - \ No newline at end of file + diff --git a/images/merging-workflows-1.svg b/images/merging-workflows-1.svg index 89d763de7..b9c12f0d8 100644 --- a/images/merging-workflows-1.svg +++ b/images/merging-workflows-1.svg @@ -1,95 +1,95 @@ - - + + images/merging-workflows-1 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C7 + + + C7 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - master + + + master - + - - - ruby_client + + + ruby_client - + - - - php_client + + + php_client - \ No newline at end of file + diff --git a/images/merging-workflows-2.svg b/images/merging-workflows-2.svg index ef8d4cf19..1bc25de6e 100644 --- a/images/merging-workflows-2.svg +++ b/images/merging-workflows-2.svg @@ -1,111 +1,111 @@ - - + + images/merging-workflows-2 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C7 + + + C7 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - - + + - - - C9 + + + C9 - - + + - - - C8 + + + C8 - + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - master + + + master - + - - - ruby_client + + + ruby_client - + - - - php_client + + + php_client - \ No newline at end of file + diff --git a/images/merging-workflows-3.svg b/images/merging-workflows-3.svg index 840fce9dc..5481cbd1f 100644 --- a/images/merging-workflows-3.svg +++ b/images/merging-workflows-3.svg @@ -1,73 +1,73 @@ - - + + images/merging-workflows-3 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - develop + + + develop - + - - - master + + + master - + - - - ruby_client + + + ruby_client - \ No newline at end of file + diff --git a/images/merging-workflows-4.svg b/images/merging-workflows-4.svg index 5abe3e117..d367ab9d9 100644 --- a/images/merging-workflows-4.svg +++ b/images/merging-workflows-4.svg @@ -1,83 +1,83 @@ - - + + images/merging-workflows-4 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - - + + - - - C6 + + + C6 - + - - - develop + + + develop - + - - - master + + + master - + - - - ruby_client + + + ruby_client - \ No newline at end of file + diff --git a/images/merging-workflows-5.svg b/images/merging-workflows-5.svg index 0773ebf65..1463bb831 100644 --- a/images/merging-workflows-5.svg +++ b/images/merging-workflows-5.svg @@ -1,83 +1,83 @@ - - + + images/merging-workflows-5 Created with Sketch. - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C5 + + + C5 - + - - - C3 + + + C3 - + - - - C4 + + + C4 - - + + - - - C6 + + + C6 - + - - - develop + + + develop - + - - - master + + + master - + - - - ruby_client + + + ruby_client - \ No newline at end of file + diff --git a/images/perils-of-rebasing-1.svg b/images/perils-of-rebasing-1.svg index 436376966..baa3ce544 100644 --- a/images/perils-of-rebasing-1.svg +++ b/images/perils-of-rebasing-1.svg @@ -1,67 +1,67 @@ - - + + images/perils-of-rebasing-1 Created with Sketch. - - + + - - - C1 + + + C1 - + - - - master + + + master - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C3 + + + C3 - + - - - master + + + master - + - - - teamone/master + + + teamone/master - - My Computer + + My Computer - - git.team1.ourcompany.com + + git.team1.ourcompany.com - \ No newline at end of file + diff --git a/images/perils-of-rebasing-2.svg b/images/perils-of-rebasing-2.svg index 381bf765b..3a99c2073 100644 --- a/images/perils-of-rebasing-2.svg +++ b/images/perils-of-rebasing-2.svg @@ -1,133 +1,133 @@ - - + + images/perils-of-rebasing-2 Created with Sketch. - - - + + + - - - C1 + + + C1 - + - - - master + + + master - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C3 + + + C3 - + - - - C7 + + + C7 - + - - - C4 + + + C4 - - + + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - C4 + + + C4 - - + + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - master + + + master - + - - - teamone/master + + + teamone/master - - My Computer + + My Computer - - git.team1.ourcompany.com + + git.team1.ourcompany.com - \ No newline at end of file + diff --git a/images/perils-of-rebasing-3.svg b/images/perils-of-rebasing-3.svg index 076ee9c46..d79c51e36 100644 --- a/images/perils-of-rebasing-3.svg +++ b/images/perils-of-rebasing-3.svg @@ -1,153 +1,153 @@ - - + + images/perils-of-rebasing-3 Created with Sketch. - - - + + + - - - C1 + + + C1 - + - - - master + + + master - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C3 + + + C3 - + - - - C7 + + + C7 - + - - - C4' + + + C4' - + - - - C4' + + + C4' - + - - - C5 + + + C5 - + - - - C4 + + + C4 - + - + - - - C6 + + + C6 - + - - - C4 + + + C4 - - + + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - master + + + master - + - - - teamone/master + + + teamone/master - - My Computer + + My Computer - - git.team1.ourcompany.com + + git.team1.ourcompany.com - \ No newline at end of file + diff --git a/images/perils-of-rebasing-4.svg b/images/perils-of-rebasing-4.svg index a159a4236..39f3cc153 100644 --- a/images/perils-of-rebasing-4.svg +++ b/images/perils-of-rebasing-4.svg @@ -1,163 +1,163 @@ - - + + images/perils-of-rebasing-4 Created with Sketch. - - - - + + + + - - - C1 + + + C1 - + - - - master + + + master - - - C1 + + + C1 - + - - - C2 + + + C2 - + - - - C3 + + + C3 - + - - - C7 + + + C7 - + - - - C8 + + + C8 - + - - - C4' + + + C4' - + - - - C4' + + + C4' - + - - - C5 + + + C5 - + - - - C4 + + + C4 - + - + - - - C6 + + + C6 - + - - - C4 + + + C4 - - + + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - master + + + master - + - - - teamone/master + + + teamone/master - - My Computer + + My Computer - - git.team1.ourcompany.com + + git.team1.ourcompany.com - \ No newline at end of file + diff --git a/images/perils-of-rebasing-5.svg b/images/perils-of-rebasing-5.svg index 7d030e66d..ebe515f08 100644 --- a/images/perils-of-rebasing-5.svg +++ b/images/perils-of-rebasing-5.svg @@ -1,122 +1,122 @@ - - + + images/perils-of-rebasing-5 Created with Sketch. - - + + - - - C1 + + + C1 - + - - - master + + + master - - - C1 + + + C1 - + - - - C4' + + + C4' - + - - - C4' + + + C4' - + - - - C2' + + + C2' - + - - - C3' + + + C3' - + - - - C5 + + + C5 - + - - - C4 + + + C4 - + - + - - - C6 + + + C6 - + - - - C5 + + + C5 - + - - - master + + + master - + - - - teamone/master + + + teamone/master - - My Computer + + My Computer - - git.team1.ourcompany.com + + git.team1.ourcompany.com - \ No newline at end of file + diff --git a/images/public-small-1.svg b/images/public-small-1.svg index 86340ca53..19ae0fe9f 100644 --- a/images/public-small-1.svg +++ b/images/public-small-1.svg @@ -1,92 +1,92 @@ - - + + images/public-small-1 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 33009 + + + 33009 - + - - - 0d708 + + + 0d708 - + - - - e5b0f + + + e5b0f - + - - - a2de3 + + + a2de3 - + - - - master + + + master - + - - - origin/ - master + + + origin/ + master - + - - - featureA + + + featureA - + - - - featureB + + + featureB - \ No newline at end of file + diff --git a/images/public-small-2.svg b/images/public-small-2.svg index fcac39945..eea0e7152 100644 --- a/images/public-small-2.svg +++ b/images/public-small-2.svg @@ -1,92 +1,92 @@ - - + + images/public-small-2 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 33009 + + + 33009 - + - - - 5399e + + + 5399e - + - - - e5b0f + + + e5b0f - + - - - dee6b + + + dee6b - + - - - master + + + master - + - - - origin/ - master + + + origin/ + master - + - - - featureA + + + featureA - + - - - featureB + + + featureB - \ No newline at end of file + diff --git a/images/public-small-3.svg b/images/public-small-3.svg index 2ad416494..b182ad659 100644 --- a/images/public-small-3.svg +++ b/images/public-small-3.svg @@ -1,110 +1,110 @@ - - + + images/public-small-3 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 33009 + + + 33009 - + - - - 5399e + + + 5399e - + - - - 17f4d + + + 17f4d - + - - - e5b0f + + + e5b0f - + - - - dee6b + + + dee6b - + - - - master + + + master - + - - - origin/ - master + + + origin/ + master - + - - - featureA + + + featureA - + - - - featureB + + + featureB - + - - - featureBv2 + + + featureBv2 - \ No newline at end of file + diff --git a/images/rebasing-1.svg b/images/rebasing-1.svg index 847b59942..153369370 100644 --- a/images/rebasing-1.svg +++ b/images/rebasing-1.svg @@ -1,64 +1,64 @@ - - + + images/rebasing-1 Created with Sketch. - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f42c5 + + + f42c5 - + - - - e43a6 + + + e43a6 - + - - - 5ddae + + + 5ddae - + - - - master + + + master - + - - - ruby_client + + + ruby_client - \ No newline at end of file + diff --git a/images/rebasing-2.svg b/images/rebasing-2.svg index 934f7a42d..27e9ab797 100644 --- a/images/rebasing-2.svg +++ b/images/rebasing-2.svg @@ -1,76 +1,76 @@ - - + + images/rebasing-2 Created with Sketch. - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f42c5 + + + f42c5 - + - - - a0a41 + + + a0a41 - + - - - master + + + master - - + + - + - - - e43a6 + + + e43a6 - - - 5ddae + + + 5ddae - + - - - ruby_client + + + ruby_client - \ No newline at end of file + diff --git a/images/remote-branches-1.svg b/images/remote-branches-1.svg index 38d9f914c..86f37d757 100644 --- a/images/remote-branches-1.svg +++ b/images/remote-branches-1.svg @@ -1,87 +1,87 @@ - - + + images/remote-branches-1 Created with Sketch. - - + + - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - - + + - - - f4265 + + + f4265 - - - master + + + master - + - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - - + + - - - f4265 + + + f4265 - - - master + + + master - - - origin/master + + + origin/master - - My Computer + + My Computer - - git.ourcompany.com + + git.ourcompany.com - - - git clone janedoe@git.ourcompany.com:project.git + + + git clone janedoe@git.ourcompany.com:project.git - - Remote branch + + Remote branch - - Local branch + + Local branch - \ No newline at end of file + diff --git a/images/remote-branches-2.svg b/images/remote-branches-2.svg index fd65ac2e8..b7aa89e5b 100644 --- a/images/remote-branches-2.svg +++ b/images/remote-branches-2.svg @@ -1,114 +1,114 @@ - - + + images/remote-branches-2 Created with Sketch. - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f4265 + + + f4265 - + - - - 31b8e + + + 31b8e - + - - - 190a3 + + + 190a3 - + - - - master + + + master - + - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f4265 + + + f4265 - + - - - a38de + + + a38de - + - - - 893cf + + + 893cf - + - - - master + + + master - - - origin/master + + + origin/master - - - - My Computer + + + + My Computer - - git.ourcompany.com + + git.ourcompany.com Someone else pushes - \ No newline at end of file + diff --git a/images/remote-branches-3.svg b/images/remote-branches-3.svg index 8d9e5afea..ca9191dea 100644 --- a/images/remote-branches-3.svg +++ b/images/remote-branches-3.svg @@ -1,131 +1,131 @@ - - + + images/remote-branches-3 Created with Sketch. - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f4265 + + + f4265 - + - - - 31b8e + + + 31b8e - + - - - 190a3 + + + 190a3 - + - - - master + + + master - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f4265 + + + f4265 - - + + - - - 31b8e + + + 31b8e - + - - - 190a3 + + + 190a3 - - - a38de + + + a38de - + - - - 893cf + + + 893cf - + - - - master + + + master - + - - - origin/master + + + origin/master - - - - My Computer + + + + My Computer - - git.ourcompany.com + + git.ourcompany.com - - - git fetch origin + + + git fetch origin - \ No newline at end of file + diff --git a/images/remote-branches-4.svg b/images/remote-branches-4.svg index 35cd86201..b63112e61 100644 --- a/images/remote-branches-4.svg +++ b/images/remote-branches-4.svg @@ -1,154 +1,154 @@ - - + + images/remote-branches-4 Created with Sketch. - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f4265 + + + f4265 - - + + - - - 31b8e + + + 31b8e - + - - - 190a3 + + + 190a3 - - - a38de + + + a38de - + - - - 893cf + + + 893cf - + - - - master + + + master - + - - - origin/master + + + origin/master - - - My Computer + + + My Computer - - git remote add teamone git://git.team1.ourcompany.com + + git remote add teamone git://git.team1.ourcompany.com - + - - - f4265 + + + f4265 - + - - - 31b8e + + + 31b8e - + - - - 190a3 + + + 190a3 - + - - - master + + + master - - - git.ourcompany.com + + + git.ourcompany.com - - origin + + origin - + - - - f4265 + + + f4265 - + - - - 31b8e + + + 31b8e - + - - - master + + + master - - - git.team1.ourcompany.com + + + git.team1.ourcompany.com - - teamone + + teamone - \ No newline at end of file + diff --git a/images/remote-branches-5.svg b/images/remote-branches-5.svg index 4ec9ad1c9..b27d48322 100644 --- a/images/remote-branches-5.svg +++ b/images/remote-branches-5.svg @@ -1,162 +1,162 @@ - - + + images/remote-branches-5 Created with Sketch. - - - 0b743 + + + 0b743 - + - - - a6b4c + + + a6b4c - + - - - f4265 + + + f4265 - - + + - - - 31b8e + + + 31b8e - + - - - 190a3 + + + 190a3 - - - a38de + + + a38de - + - - - 893cf + + + 893cf - + - - - master + + + master - + - - - origin/master + + + origin/master - + - - - teamone/master + + + teamone/master - - - My Computer + + + My Computer - - git fetch teamone + + git fetch teamone - + - + - - - f4265 + + + f4265 - + - - - 31b8e + + + 31b8e - + - - - 190a3 + + + 190a3 - + - - - master + + + master - - - git.ourcompany.com + + + git.ourcompany.com - - origin + + origin - + - - - f4265 + + + f4265 - + - - - 31b8e + + + 31b8e - + - - - master + + + master - - - git.team1.ourcompany.com + + + git.team1.ourcompany.com - - teamone + + teamone - \ No newline at end of file + diff --git a/images/replace1.svg b/images/replace1.svg index 85627aab7..acce1ce17 100644 --- a/images/replace1.svg +++ b/images/replace1.svg @@ -1,64 +1,64 @@ - - + + images/replace1 Created with Sketch. - - + + - - - ef989 + + + ef989 fifth - - - c6e1e + + + c6e1e fourth - + - - - 9c68f + + + 9c68f third - + - - - 94570 + + + 94570 second - + - - - c1822 + + + c1822 first - - - master + + + master - \ No newline at end of file + diff --git a/images/replace2.svg b/images/replace2.svg index 3b7fa57a1..11e62981b 100644 --- a/images/replace2.svg +++ b/images/replace2.svg @@ -1,71 +1,71 @@ - - + + images/replace2 Created with Sketch. - - + + - - - ef989 + + + ef989 fifth - - - c6e1e + + + c6e1e fourth - + - - - 9c68f + + + 9c68f third - + - - - 94570 + + + 94570 second - + - - - c1822 + + + c1822 first - - - master + + + master - + - - - history + + + history - \ No newline at end of file + diff --git a/images/replace3.svg b/images/replace3.svg index ba1fd324d..617910226 100644 --- a/images/replace3.svg +++ b/images/replace3.svg @@ -1,59 +1,59 @@ - - + + images/replace3 Created with Sketch. - + - - - ef989 + + + ef989 fifth - - - c6e1e + + + c6e1e fourth - + - - - 9c68f + + + 9c68f third - + - - - 94570 + + + 94570 second - + - - - c1822 + + + c1822 - - - 622e8 + + + 622e8 @@ -62,12 +62,12 @@ instructions - + - - - history + + + history - \ No newline at end of file + diff --git a/images/replace4.svg b/images/replace4.svg index e9aefd815..a8fc4b82d 100644 --- a/images/replace4.svg +++ b/images/replace4.svg @@ -1,22 +1,22 @@ - - + + images/replace4 Created with Sketch. - + - + - + - + - - - + + + r e @@ -26,74 +26,74 @@ e - - - ef989 + + + ef989 fifth - - - c6e1e + + + c6e1e fourth - - + + - - - 9c68f + + + 9c68f third - - - e146b + + + e146b fifth - + - - - 81a70 + + + 81a70 fourth - + - - - 94570 + + + 94570 second - + - - - c1822 + + + c1822 - - - 622e8 + + + 622e8 @@ -102,19 +102,19 @@ instructions - + - - - history + + + history - + - - - master + + + master - \ No newline at end of file + diff --git a/images/replace5.svg b/images/replace5.svg index 74f989539..428132f58 100644 --- a/images/replace5.svg +++ b/images/replace5.svg @@ -1,97 +1,97 @@ - - + + images/replace5 Created with Sketch. - + - - - e146b + + + e146b - - fifth + + fifth - - - - replace + + + + replace - - - 81a70 + + + 81a70 - - fourth + + fourth - - - third + + + third - + - - - 622e8 + + + 622e8 - - - c6e1e + + + c6e1e - - instructions + + instructions - - - 9c68f + + + 9c68f - - - 94570 + + + 94570 - - second + + second - - - + + + - - - master + + + master - - - c1822 + + + c1822 - - fourth + + fourth - - third + + third - - first + + first - - - history + + + history - \ No newline at end of file + diff --git a/images/rerere1.svg b/images/rerere1.svg index 80a8458bc..1ad479db4 100644 --- a/images/rerere1.svg +++ b/images/rerere1.svg @@ -1,49 +1,49 @@ - - + + images/rerere1 Created with Sketch. - + - + - - - - + + + + - - - master + + + master - - - hello world + + + hello world - - - hola world + + + hola world - - - hello mundo + + + hello mundo - + - - - i18-world + + + i18-world - \ No newline at end of file + diff --git a/images/rerere2.svg b/images/rerere2.svg index 241b7ee64..98af04ad0 100644 --- a/images/rerere2.svg +++ b/images/rerere2.svg @@ -1,67 +1,67 @@ - - + + images/rerere2 Created with Sketch. - + - + - - - - - - + + + + + + - - - master + + + master - - - hello world + + + hello world - - - hola world + + + hola world - - - hola mundo + + + hola mundo - - - hello mundo + + + hello mundo - + - - - i18-world + + + i18-world - - - rerere cache + + + rerere cache - - - - puts ‘hola world’ - - puts ‘hello mundo’ - ++ puts ‘hola mundo’ + + + - puts ‘hola world’ + - puts ‘hello mundo’ + ++ puts ‘hola mundo’ - \ No newline at end of file + diff --git a/images/rerere3.svg b/images/rerere3.svg index 6662b3690..e1a28c94d 100644 --- a/images/rerere3.svg +++ b/images/rerere3.svg @@ -1,73 +1,73 @@ - - + + images/rerere3 Created with Sketch. - + - + - - - - - + + + + + - - - master + + + master - - - hello world + + + hello world - - - hola world + + + hola world - - - hola mundo + + + hola mundo - - - hello mundo + + + hello mundo - + - - - i18-world + + + i18-world - - - rerere cache + + + rerere cache - - - - puts ‘hola world’ - - puts ‘hello mundo’ - ++ puts ‘hola mundo’ + + + - puts ‘hola world’ + - puts ‘hello mundo’ + ++ puts ‘hola mundo’ - - hello mundo + + hello mundo - - - rebase + + + rebase - \ No newline at end of file + diff --git a/images/reset-checkout.svg b/images/reset-checkout.svg index 2fed60e2e..9531e6e5b 100644 --- a/images/reset-checkout.svg +++ b/images/reset-checkout.svg @@ -1,5 +1,5 @@ - - + + images/reset-checkout Created with Sketch. @@ -7,42 +7,42 @@ - - - commit A + + + commit A - + - - - commit B + + + commit B - + - - - master + + + master - + - - - develop + + + develop - + - - - HEAD + + + HEAD @@ -54,42 +54,42 @@ - - - commit A + + + commit A - + - - - commit B + + + commit B - + - - - master + + + master - + - - - develop + + + develop - + - - - HEAD + + + HEAD @@ -98,54 +98,54 @@ after reset - - + + after checkout - - - commit A + + + commit A - + - - - commit B + + + commit B - + - - - master + + + master - + - - - develop + + + develop - + - - - HEAD + + + HEAD - \ No newline at end of file + diff --git a/images/reset-ex1.svg b/images/reset-ex1.svg index f78f2ba36..b51cd777c 100644 --- a/images/reset-ex1.svg +++ b/images/reset-ex1.svg @@ -1,67 +1,67 @@ - - + + images/reset-ex1 Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - ? + + ? - - - Git Repository + + + Git Repository - - - file.txt - v1 + + + file.txt + v1 - \ No newline at end of file + diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg index 6d4efda58..0234a25c6 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -1,77 +1,77 @@ - - + + images/reset-ex2 Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - ? + + ? - - - Git Repository + + + Git Repository - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - - git add + + git add - \ No newline at end of file + diff --git a/images/reset-ex3.svg b/images/reset-ex3.svg index cab64a078..09151880b 100644 --- a/images/reset-ex3.svg +++ b/images/reset-ex3.svg @@ -1,95 +1,95 @@ - - + + images/reset-ex3 Created with Sketch. - + - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - - git commit + + git commit - - eb43bf8 + + eb43bf8 - - eb43bf8 + + eb43bf8 - \ No newline at end of file + diff --git a/images/reset-ex4.svg b/images/reset-ex4.svg index e49a45d7b..96208b62d 100644 --- a/images/reset-ex4.svg +++ b/images/reset-ex4.svg @@ -1,95 +1,95 @@ - - + + images/reset-ex4 Created with Sketch. - + - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - - edit file + + edit file - - eb43bf8 + + eb43bf8 - - eb43bf8 + + eb43bf8 - \ No newline at end of file + diff --git a/images/reset-ex5.svg b/images/reset-ex5.svg index a60d93803..43992d53b 100644 --- a/images/reset-ex5.svg +++ b/images/reset-ex5.svg @@ -1,95 +1,95 @@ - - + + images/reset-ex5 Created with Sketch. - + - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - - git add + + git add - - eb43bf8 + + eb43bf8 - - eb43bf8 + + eb43bf8 - \ No newline at end of file + diff --git a/images/reset-ex6.svg b/images/reset-ex6.svg index aa6bc8781..747b01a45 100644 --- a/images/reset-ex6.svg +++ b/images/reset-ex6.svg @@ -1,111 +1,111 @@ - - + + images/reset-ex6 Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v2 + + + file.txt + v2 - - git commit + + git commit - - 9e5e6a4 + + 9e5e6a4 - + - - - file.txt - v1 + + + file.txt + v1 - - eb43bf8 + + eb43bf8 - - - file.txt - v2 + + + file.txt + v2 - - - 9e5e6a4 + + + 9e5e6a4 - + - \ No newline at end of file + diff --git a/images/reset-hard.svg b/images/reset-hard.svg index ce3c13eab..5eff6b325 100644 --- a/images/reset-hard.svg +++ b/images/reset-hard.svg @@ -1,137 +1,137 @@ - - + + images/reset-hard Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v2 + + + file.txt + v2 - - git reset --hard HEAD~ + + git reset --hard HEAD~ - - 9e5e6a4 + + 9e5e6a4 - + - - - file.txt - v1 + + + file.txt + v1 - - eb43bf8 + + eb43bf8 - - - file.txt - v2 + + + file.txt + v2 - - - 9e5e6a4 + + + 9e5e6a4 - - - file.txt - v3 + + + file.txt + v3 - - - 38eb946 + + + 38eb946 - - - - - 2 + + + + + 2 - - - 3 + + + 3 - - 1 + + 1 - + - \ No newline at end of file + diff --git a/images/reset-mixed.svg b/images/reset-mixed.svg index 6ffd4b6cd..4cc100453 100644 --- a/images/reset-mixed.svg +++ b/images/reset-mixed.svg @@ -1,133 +1,133 @@ - - + + images/reset-mixed Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v3 + + + file.txt + v3 - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v2 + + + file.txt + v2 - - git reset [--mixed] HEAD~ + + git reset [--mixed] HEAD~ - - 9e5e6a4 + + 9e5e6a4 - + - - - file.txt - v1 + + + file.txt + v1 - - eb43bf8 + + eb43bf8 - - - file.txt - v2 + + + file.txt + v2 - - - 9e5e6a4 + + + 9e5e6a4 - - - file.txt - v3 + + + file.txt + v3 - - - 38eb946 + + + 38eb946 - - - - - 2 + + + + + 2 - - 1 + + 1 - + - \ No newline at end of file + diff --git a/images/reset-path1.svg b/images/reset-path1.svg index d37655e57..c52a1ec1a 100644 --- a/images/reset-path1.svg +++ b/images/reset-path1.svg @@ -1,96 +1,96 @@ - - + + images/reset-path1 Created with Sketch. - + - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v1 + + + file.txt + v1 - + - - - file.txt - v1 + + + file.txt + v1 - - git reset file.txt + + git reset file.txt - - eb43bf8 + + eb43bf8 - - eb43bf8 + + eb43bf8 - \ No newline at end of file + diff --git a/images/reset-path2.svg b/images/reset-path2.svg index 98863631a..2e4f059bb 100644 --- a/images/reset-path2.svg +++ b/images/reset-path2.svg @@ -1,96 +1,96 @@ - - + + images/reset-path2 Created with Sketch. - + - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v2 + + + file.txt + v2 - - - file.txt - v1 + + + file.txt + v1 - + - - - file.txt - v1 + + + file.txt + v1 - - git add file.txt + + git add file.txt - - eb43bf8 + + eb43bf8 - - eb43bf8 + + eb43bf8 - \ No newline at end of file + diff --git a/images/reset-path3.svg b/images/reset-path3.svg index 3dcf3d38b..960192eba 100644 --- a/images/reset-path3.svg +++ b/images/reset-path3.svg @@ -1,125 +1,125 @@ - - + + images/reset-path3 Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - git reset eb43 -- file.txt + + git reset eb43 -- file.txt - - 38eb946 + + 38eb946 - + - - - file.txt - v1 + + + file.txt + v1 - - eb43bf8 + + eb43bf8 - - - file.txt - v2 + + + file.txt + v2 - - - 9e5e6a4 + + + 9e5e6a4 - - - file.txt - v3 + + + file.txt + v3 - - - 38eb946 + + + 38eb946 - - + + - - - file.txt - v1 + + + file.txt + v1 - - - file.txt - v3 + + + file.txt + v3 - - - file.txt - v3 + + + file.txt + v3 - \ No newline at end of file + diff --git a/images/reset-soft.svg b/images/reset-soft.svg index b358c3773..0aadf7e18 100644 --- a/images/reset-soft.svg +++ b/images/reset-soft.svg @@ -1,126 +1,126 @@ - - + + images/reset-soft Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v3 + + + file.txt + v3 - - - file.txt - v3 + + + file.txt + v3 - - - file.txt - v2 + + + file.txt + v2 - - git reset --soft HEAD~ + + git reset --soft HEAD~ - - 9e5e6a4 + + 9e5e6a4 - + - - - file.txt - v1 + + + file.txt + v1 - - eb43bf8 + + eb43bf8 - - - file.txt - v2 + + + file.txt + v2 - - - 9e5e6a4 + + + 9e5e6a4 - - - file.txt - v3 + + + file.txt + v3 - - - 38eb946 + + + 38eb946 - - - + + + - \ No newline at end of file + diff --git a/images/reset-squash-r1.svg b/images/reset-squash-r1.svg index 7ca3266de..6754840f6 100644 --- a/images/reset-squash-r1.svg +++ b/images/reset-squash-r1.svg @@ -1,152 +1,152 @@ - - + + images/reset-squash-r1 Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - 38eb946 + + 38eb946 - + - - - file-a.txt v1 + + + file-a.txt v1 - - eb43bf8 + + eb43bf8 - - + + - - - 9e5e6a4 + + + 9e5e6a4 - - - file-a.txt v2 + + + file-a.txt v2 - - - file-b.txt v1 + + + file-b.txt v1 - - - 38eb946 + + + 38eb946 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - \ No newline at end of file + diff --git a/images/reset-squash-r2.svg b/images/reset-squash-r2.svg index 33f99784b..80c08e846 100644 --- a/images/reset-squash-r2.svg +++ b/images/reset-squash-r2.svg @@ -1,147 +1,147 @@ - - + + images/reset-squash-r2 Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - git reset --soft HEAD~2 + + git reset --soft HEAD~2 - - eb43bf8 + + eb43bf8 - + - - - file-a.txt v1 + + + file-a.txt v1 - - eb43bf8 + + eb43bf8 - - + + - - - 9e5e6a4 + + + 9e5e6a4 - - - file-a.txt v2 + + + file-a.txt v2 - - - file-b.txt v1 + + + file-b.txt v1 - - - 38eb946 + + + 38eb946 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v1 + + + file-a.txt v1 - \ No newline at end of file + diff --git a/images/reset-squash-r3.svg b/images/reset-squash-r3.svg index a5faf12a6..ac5812873 100644 --- a/images/reset-squash-r3.svg +++ b/images/reset-squash-r3.svg @@ -1,177 +1,177 @@ - - + + images/reset-squash-r3 Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - git commit + + git commit - - 68aef35 + + 68aef35 - + - - - file-a.txt v1 + + + file-a.txt v1 - - eb43bf8 + + eb43bf8 - - + + - - - 9e5e6a4 + + + 9e5e6a4 - - - file-a.txt v2 + + + file-a.txt v2 - - - file-b.txt v1 + + + file-b.txt v1 - - - 38eb946 + + + 38eb946 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - 68aef35 + + + 68aef35 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - - file-a.txt v3 + + + file-a.txt v3 - - - file-b.txt v1 + + + file-b.txt v1 - - + + - \ No newline at end of file + diff --git a/images/reset-start.svg b/images/reset-start.svg index be7b8c234..0664945e9 100644 --- a/images/reset-start.svg +++ b/images/reset-start.svg @@ -1,122 +1,122 @@ - - + + images/reset-start Created with Sketch. - + - - - Working - Directory + + + Working + Directory - + - - - Index + + + Index - + - - - HEAD + + + HEAD - + - - - HEAD + + + HEAD - - - master + + + master - - - Git Repository + + + Git Repository - - - file.txt - v3 + + + file.txt + v3 - - - file.txt - v3 + + + file.txt + v3 - - - file.txt - v3 + + + file.txt + v3 - - 38eb946 + + 38eb946 - + - - - file.txt - v1 + + + file.txt + v1 - - eb43bf8 + + eb43bf8 - - - file.txt - v2 + + + file.txt + v2 - - - 9e5e6a4 + + + 9e5e6a4 - - - file.txt - v3 + + + file.txt + v3 - - - 38eb946 + + + 38eb946 - - + + - \ No newline at end of file + diff --git a/images/reset-workflow.svg b/images/reset-workflow.svg index 569d2a819..1bd0567d2 100644 --- a/images/reset-workflow.svg +++ b/images/reset-workflow.svg @@ -1,34 +1,34 @@ - - + + images/reset-workflow Created with Sketch. - - - + + + - - - Working - Directory + + + Working + Directory - - - Index + + + Index - - - HEAD + + + HEAD - - - + + + Checkout the project @@ -39,4 +39,4 @@ Commit - \ No newline at end of file + diff --git a/images/small-team-1.svg b/images/small-team-1.svg index faab9ef80..af5fff642 100644 --- a/images/small-team-1.svg +++ b/images/small-team-1.svg @@ -1,57 +1,57 @@ - - + + images/small-team-1 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 738ee + + + 738ee - + - - - fbff5 + + + fbff5 - + - - - origin/master + + + origin/master - + - - - master + + + master - \ No newline at end of file + diff --git a/images/small-team-2.svg b/images/small-team-2.svg index 9b6ade277..a8296d6d6 100644 --- a/images/small-team-2.svg +++ b/images/small-team-2.svg @@ -1,65 +1,65 @@ - - + + images/small-team-2 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 738ee + + + 738ee - - + + - - - 72bbc + + + 72bbc - + - - - fbff5 + + + fbff5 - + - - - origin/master + + + origin/master - + - - - master + + + master - \ No newline at end of file + diff --git a/images/small-team-3.svg b/images/small-team-3.svg index 22627f954..4f3478e75 100644 --- a/images/small-team-3.svg +++ b/images/small-team-3.svg @@ -1,67 +1,67 @@ - - + + images/small-team-3 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - 738ee + + + 738ee - - + + - - - 72bbc + + + 72bbc - + - - - fbff5 + + + fbff5 - + - - - origin/master + + + origin/master - + - - - master + + + master - \ No newline at end of file + diff --git a/images/small-team-4.svg b/images/small-team-4.svg index 18eb9fab4..d2ced1a1c 100644 --- a/images/small-team-4.svg +++ b/images/small-team-4.svg @@ -1,84 +1,84 @@ - - + + images/small-team-4 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - fbff5 + + + fbff5 - + - - - 8149a + + + 8149a - + - - - 23ac6 + + + 23ac6 - + - - - 4af42 + + + 4af42 - + - - - origin/master + + + origin/master - + - - - master + + + master - + - - - issue54 + + + issue54 - \ No newline at end of file + diff --git a/images/small-team-5.svg b/images/small-team-5.svg index 8088b3874..491c17f6e 100644 --- a/images/small-team-5.svg +++ b/images/small-team-5.svg @@ -1,101 +1,101 @@ - - + + images/small-team-5 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - fbff5 + + + fbff5 - + - - - 738ee + + + 738ee - - + + - - - 72bbc + + + 72bbc - + - - - 8149a + + + 8149a - + - - - 23ac6 + + + 23ac6 - + - - - 4af42 + + + 4af42 - + - - - origin/master + + + origin/master - + - - - master + + + master - + - - - issue54 + + + issue54 - \ No newline at end of file + diff --git a/images/small-team-6.svg b/images/small-team-6.svg index 88fe2e96c..90feda18a 100644 --- a/images/small-team-6.svg +++ b/images/small-team-6.svg @@ -1,109 +1,109 @@ - - + + images/small-team-6 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - fbff5 + + + fbff5 - + - - - 738ee + + + 738ee - - + + - - - 72bbc + + + 72bbc - - + + - - - 8059c + + + 8059c - + - - - 8149a + + + 8149a - + - - - 23ac6 + + + 23ac6 - + - - - 4af42 + + + 4af42 - + - - - origin/master + + + origin/master - + - - - master + + + master - + - - - issue54 + + + issue54 - \ No newline at end of file + diff --git a/images/small-team-7.svg b/images/small-team-7.svg index 455872303..c6c4f1717 100644 --- a/images/small-team-7.svg +++ b/images/small-team-7.svg @@ -1,109 +1,109 @@ - - + + images/small-team-7 Created with Sketch. - - - 4b078 + + + 4b078 - + - - - 1edee + + + 1edee - + - - - fbff5 + + + fbff5 - + - - - 738ee + + + 738ee - - + + - - - 72bbc + + + 72bbc - - + + - - - 8059c + + + 8059c - + - - - 8149a + + + 8149a - + - - - 23ac6 + + + 23ac6 - + - - - 4af42 + + + 4af42 - + - - - origin/master + + + origin/master - + - - - master + + + master - + - - - issue54 + + + issue54 - \ No newline at end of file + diff --git a/images/small-team-flow.svg b/images/small-team-flow.svg index 95ca1ee80..0c47400d2 100644 --- a/images/small-team-flow.svg +++ b/images/small-team-flow.svg @@ -1,31 +1,31 @@ - - + + images/small-team-flow Created with Sketch. - - - Server + + + Server - - - John + + + John - - - Jessica + + + Jessica - - - - + + + + git clone @@ -35,61 +35,61 @@ git clone - + git fetch - + git push - + git push - + git push - + git fetch - + git fetch - - + + git commit - + git merge - + git merge - + - - - Server + + + Server - - - John + + + John - - - Jessica + + + Jessica - \ No newline at end of file + diff --git a/images/smudge.svg b/images/smudge.svg index e1c38bcd6..f825bd91b 100644 --- a/images/smudge.svg +++ b/images/smudge.svg @@ -1,73 +1,73 @@ - - + + images/smudge Created with Sketch. - - - fileA.txt + + + fileA.txt - + - - - fileA.txt' + + + fileA.txt' - - - fileB.txt' + + + fileB.txt' - - - fileB.txt + + + fileB.txt - - - fileC.rb + + + fileC.rb - - - fileC.rb + + + fileC.rb - - Staging Area + + Staging Area - - Working Directory + + Working Directory - - *.txt Filter + + *.txt Filter - - - smudge + + + smudge - - - clean + + + clean - - - - - + + + + + - \ No newline at end of file + diff --git a/images/snapshots.svg b/images/snapshots.svg index c407fc7af..06ccacd72 100644 --- a/images/snapshots.svg +++ b/images/snapshots.svg @@ -1,167 +1,167 @@ - - + + images/snapshots Created with Sketch. - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - - - Version 1 + + + Version 1 - - - Version 2 + + + Version 2 - - - Version 3 + + + Version 3 - - - Version 4 + + + Version 4 - - - Version 5 + + + Version 5 - - - File A + + + File A - - - File A + + + File A - - - A1 + + + A1 - - - C1 + + + C1 - - - C2 + + + C2 - - - B1 + + + B1 - + B - + A1 - + A2 - + B - + C2 - - - A2 + + + A2 - - - B2 + + + B2 - - - C3 + + + C3 - - - File B + + + File B - - - File C + + + File C - + Checkins Over Time - \ No newline at end of file + diff --git a/images/symbols.svg b/images/symbols.svg index 3de4b78de..8fd4aa02a 100644 --- a/images/symbols.svg +++ b/images/symbols.svg @@ -1,158 +1,158 @@ - - + + images/symbols Created with Sketch. - - - C6 + + + C6 - - - v1.0 + + + v1.0 - - - HEAD + + + HEAD - - - tree + + + tree - - - Version 5 + + + Version 5 - - - integration - manager + + + integration + manager - - - developer - public + + + developer + public - - - Staging - Area + + + Staging + Area - - - 9c68f + + + 9c68f - - - c2b9e + + + c2b9e - - - HEAD + + + HEAD - - - Working - Directory + + + Working + Directory - - - size - 92ec2 - Scott - Scott + + + size + 92ec2 + Scott + Scott - - commit - - tree - author - committer + + commit + + tree + author + committer - - The initial commit of my project + + The initial commit of my project - - - size - 5b1d3 README - 911e7 LICENSE - cba0a test.rb + + + size + 5b1d3 README + 911e7 LICENSE + cba0a test.rb - - tree - - blob - blob - blob + + tree + + blob + blob + blob - - - size + + + size - - blob + + blob - - == Testing library - - This library is used to test - Ruby projects. + + == Testing library + + This library is used to test + Ruby projects. - - - hello mundo + + + hello mundo - - - fbff5 + + + fbff5 - - - 738ee + + + 738ee - - - fba9a + + + fba9a - \ No newline at end of file + diff --git a/images/topic-branches-1.svg b/images/topic-branches-1.svg index 348fb6658..4fdba76d4 100644 --- a/images/topic-branches-1.svg +++ b/images/topic-branches-1.svg @@ -1,129 +1,129 @@ - - + + images/topic-branches-1 Created with Sketch. - - - C0 + + + C0 - + - - - C1 + + + C1 - + - - - C3 + + + C3 - + - - - C9 + + + C9 - + - - - C10 + + + C10 - + - - - C2 + + + C2 - + - - - C4 + + + C4 - + - - - C5 + + + C5 - + - - - C6 + + + C6 - + - - - C12 + + + C12 - + - - - C13 + + + C13 - + - - - C7 + + + C7 - + - - - C8 + + + C8 - + - - - C11 + + + C11 - - - master + + + master - - - iss91 + + + iss91 - - - iss91v2 + + + iss91v2 - - - dumbidea + + + dumbidea - \ No newline at end of file + diff --git a/images/topic-branches-2.svg b/images/topic-branches-2.svg index f44375e43..a1faa101c 100644 --- a/images/topic-branches-2.svg +++ b/images/topic-branches-2.svg @@ -1,117 +1,117 @@ - - + + images/topic-branches-2 Created with Sketch. - - - C0 + + + C0 - + - - - C1 + + + C1 - + - - - C3 + + + C3 - + - - - C9 + + + C9 - + - - - C10 + + + C10 - + - - - C2 + + + C2 - + - - - C4 + + + C4 - + - - - C13 + + + C13 - - + + - - - C14 + + + C14 - + - - - C12 + + + C12 - - - master + + + master - + - - - C7 + + + C7 - + - - - C8 + + + C8 - + - - - C11 + + + C11 - - - iss91v2 + + + iss91v2 - - - dumbidea + + + dumbidea - \ No newline at end of file + diff --git a/images/two-branches.svg b/images/two-branches.svg index eabc82e08..e5ca2f12c 100644 --- a/images/two-branches.svg +++ b/images/two-branches.svg @@ -1,43 +1,43 @@ - - + + images/two-branches Created with Sketch. - - - - + + + + - - - master + + + master - - - testing + + + testing - - - f30ab + + + f30ab - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - + - \ No newline at end of file + diff --git a/images/undomerge-reset.svg b/images/undomerge-reset.svg index d6f0f88ec..1cdb4a313 100644 --- a/images/undomerge-reset.svg +++ b/images/undomerge-reset.svg @@ -1,94 +1,94 @@ - - + + images/undomerge-reset Created with Sketch. - - - C1 + + + C1 - + - + - - - C2 + + + C2 - + - - - C5 + + + C5 - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C6 + + + C6 - - + + - - - M + + + M - + - - - master + + + master - + - - - HEAD + + + HEAD - + - - - topic + + + topic - \ No newline at end of file + diff --git a/images/undomerge-revert.svg b/images/undomerge-revert.svg index 7c6e754f7..9e0916e8f 100644 --- a/images/undomerge-revert.svg +++ b/images/undomerge-revert.svg @@ -1,101 +1,101 @@ - - + + images/undomerge-revert Created with Sketch. - - - C1 + + + C1 - - + + - + - - - C2 + + + C2 - + - - - C5 + + + C5 - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C6 + + + C6 - + - - - M + + + M - + - - - ^M + + + ^M - + - - - master + + + master - + - - - HEAD + + + HEAD - + - - - topic + + + topic - \ No newline at end of file + diff --git a/images/undomerge-revert2.svg b/images/undomerge-revert2.svg index 05b937455..6c656744c 100644 --- a/images/undomerge-revert2.svg +++ b/images/undomerge-revert2.svg @@ -1,116 +1,116 @@ - - + + images/undomerge-revert2 Created with Sketch. - - - C1 + + + C1 - - + + - + - - - C2 + + + C2 - + - - - C5 + + + C5 - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C6 + + + C6 - + - - - C7 + + + C7 - - + + - - - C8 + + + C8 - + - - - M + + + M - + - - - ^M + + + ^M - + - - - master + + + master - + - - - HEAD + + + HEAD - + - - - topic + + + topic - \ No newline at end of file + diff --git a/images/undomerge-revert3.svg b/images/undomerge-revert3.svg index c288fef90..df372279d 100644 --- a/images/undomerge-revert3.svg +++ b/images/undomerge-revert3.svg @@ -1,125 +1,125 @@ - - + + images/undomerge-revert3 Created with Sketch. - - - C1 + + + C1 - - + + - + - - - C2 + + + C2 - + - - - C5 + + + C5 - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C6 + + + C6 - + - - - C7 + + + C7 - + - - - ^^M + + + ^^M - - + + - - - C8 + + + C8 - + - - - M + + + M - + - - - ^M + + + ^M - + - - - master + + + master - + - - - HEAD + + + HEAD - + - - - topic + + + topic - \ No newline at end of file + diff --git a/images/undomerge-start.svg b/images/undomerge-start.svg index 483c3a0e0..4eeed8cb4 100644 --- a/images/undomerge-start.svg +++ b/images/undomerge-start.svg @@ -1,90 +1,90 @@ - - + + images/undomerge-start Created with Sketch. - - - C1 + + + C1 - - + + - + - - - C2 + + + C2 - + - - - C5 + + + C5 - - - C3 + + + C3 - + - - - C4 + + + C4 - + - - - C6 + + + C6 - + - - - M + + + M - + - - - master + + + master - + - - - HEAD + + + HEAD - + - - - topic + + + topic - \ No newline at end of file + From 613f3373e871ad050fe7d3c0d3268837260b3ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Fri, 9 Aug 2019 22:40:37 +0200 Subject: [PATCH 02/23] Convert remaining Roboto strings --- images/advance-master.svg | 16 ++--- images/advance-testing.svg | 14 ++-- images/areas.svg | 12 ++-- images/basic-branching-1.svg | 8 +-- images/basic-branching-2.svg | 10 +-- images/basic-branching-3.svg | 12 ++-- images/basic-branching-4.svg | 16 ++--- images/basic-branching-5.svg | 16 ++--- images/basic-branching-6.svg | 16 ++--- images/basic-merging-1.svg | 22 +++--- images/basic-merging-2.svg | 18 ++--- images/basic-rebase-1.svg | 14 ++-- images/basic-rebase-2.svg | 16 ++--- images/basic-rebase-3.svg | 16 ++--- images/basic-rebase-4.svg | 14 ++-- images/benevolent-dictator.svg | 14 ++-- images/branch-and-history.svg | 18 ++--- images/centralized.svg | 8 +-- images/checkout-master.svg | 14 ++-- images/clean.svg | 28 ++++---- images/commit-and-tree.svg | 114 ++++++++++++++++---------------- images/commits-and-parents.svg | 30 ++++----- images/data-model-1.svg | 18 ++--- images/data-model-2.svg | 28 ++++---- images/data-model-3.svg | 48 +++++++------- images/data-model-4.svg | 52 +++++++-------- images/deltas.svg | 34 +++++----- images/distributed.svg | 34 +++++----- images/double-dot.svg | 16 ++--- images/head-to-master.svg | 12 ++-- images/head-to-testing.svg | 12 ++-- images/integration-manager.svg | 16 ++--- images/interesting-rebase-1.svg | 24 +++---- images/interesting-rebase-2.svg | 28 ++++---- images/interesting-rebase-3.svg | 24 +++---- images/interesting-rebase-4.svg | 30 ++++----- images/interesting-rebase-5.svg | 20 +++--- images/large-merges-1.svg | 36 +++++----- images/large-merges-2.svg | 50 +++++++------- images/lifecycle.svg | 18 ++--- images/local.svg | 14 ++-- images/lr-branches-1.svg | 20 +++--- images/lr-branches-2.svg | 20 +++--- images/managed-team-1.svg | 16 ++--- images/managed-team-2.svg | 28 ++++---- images/managed-team-3.svg | 32 ++++----- images/managed-team-flow.svg | 52 +++++++-------- images/merging-workflows-1.svg | 20 +++--- images/merging-workflows-2.svg | 24 +++---- images/merging-workflows-3.svg | 16 ++--- images/merging-workflows-4.svg | 18 ++--- images/merging-workflows-5.svg | 18 ++--- images/perils-of-rebasing-1.svg | 18 ++--- images/perils-of-rebasing-2.svg | 32 ++++----- images/perils-of-rebasing-3.svg | 36 +++++----- images/perils-of-rebasing-4.svg | 38 +++++------ images/perils-of-rebasing-5.svg | 30 ++++----- images/public-small-1.svg | 20 +++--- images/public-small-2.svg | 20 +++--- images/public-small-3.svg | 24 +++---- images/rebasing-1.svg | 14 ++-- images/rebasing-2.svg | 16 ++--- images/remote-branches-1.svg | 28 ++++---- images/remote-branches-2.svg | 32 ++++----- images/remote-branches-3.svg | 36 +++++----- images/remote-branches-4.svg | 44 ++++++------ images/remote-branches-5.svg | 46 ++++++------- images/replace1.svg | 22 +++--- images/replace2.svg | 24 +++---- images/replace3.svg | 26 ++++---- images/replace4.svg | 38 +++++------ images/replace5.svg | 36 +++++----- images/rerere1.svg | 10 +-- images/rerere2.svg | 16 ++--- images/rerere3.svg | 20 +++--- images/reset-checkout.svg | 36 +++++----- images/reset-ex1.svg | 16 ++--- images/reset-ex2.svg | 20 +++--- images/reset-ex3.svg | 26 ++++---- images/reset-ex4.svg | 26 ++++---- images/reset-ex5.svg | 26 ++++---- images/reset-ex6.svg | 30 ++++----- images/reset-hard.svg | 40 +++++------ images/reset-mixed.svg | 38 +++++------ images/reset-path1.svg | 26 ++++---- images/reset-path2.svg | 26 ++++---- images/reset-path3.svg | 34 +++++----- images/reset-soft.svg | 34 +++++----- images/reset-squash-r1.svg | 42 ++++++------ images/reset-squash-r2.svg | 42 ++++++------ images/reset-squash-r3.svg | 50 +++++++------- images/reset-start.svg | 32 ++++----- images/reset-workflow.svg | 12 ++-- images/small-team-1.svg | 12 ++-- images/small-team-2.svg | 14 ++-- images/small-team-3.svg | 14 ++-- images/small-team-4.svg | 18 ++--- images/small-team-5.svg | 22 +++--- images/small-team-6.svg | 24 +++---- images/small-team-7.svg | 24 +++---- images/small-team-flow.svg | 36 +++++----- images/smudge.svg | 22 +++--- images/snapshots.svg | 44 ++++++------ images/symbols.svg | 48 +++++++------- images/topic-branches-1.svg | 36 +++++----- images/topic-branches-2.svg | 32 ++++----- images/two-branches.svg | 10 +-- images/undomerge-reset.svg | 20 +++--- images/undomerge-revert.svg | 22 +++--- images/undomerge-revert2.svg | 26 ++++---- images/undomerge-revert3.svg | 28 ++++---- images/undomerge-start.svg | 20 +++--- 112 files changed, 1439 insertions(+), 1439 deletions(-) diff --git a/images/advance-master.svg b/images/advance-master.svg index 4084151f7..9e870b63b 100644 --- a/images/advance-master.svg +++ b/images/advance-master.svg @@ -10,52 +10,52 @@ - + f30ab - + 34ac2 - + 98ca9 - + 87ab2 - + c2b9e - + testing - + master - + HEAD diff --git a/images/advance-testing.svg b/images/advance-testing.svg index 8bddf1809..4c9280c91 100644 --- a/images/advance-testing.svg +++ b/images/advance-testing.svg @@ -10,45 +10,45 @@ - + master - + f30ab - + 87ab2 - + 34ac2 - + 98ca9 - + testing - + HEAD diff --git a/images/areas.svg b/images/areas.svg index fdf3a9037..8d2a0b324 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -9,21 +9,21 @@ - + Working Directory - + Staging Area - + .git directory (Repository) @@ -31,13 +31,13 @@ - + Checkout the project - + Stage Fixes - + Commit diff --git a/images/basic-branching-1.svg b/images/basic-branching-1.svg index c71fa0221..e361c76eb 100644 --- a/images/basic-branching-1.svg +++ b/images/basic-branching-1.svg @@ -6,7 +6,7 @@ - + C0 @@ -15,19 +15,19 @@ - + C1 - + C2 - + master diff --git a/images/basic-branching-2.svg b/images/basic-branching-2.svg index 198ce7a52..94059fbc5 100644 --- a/images/basic-branching-2.svg +++ b/images/basic-branching-2.svg @@ -6,7 +6,7 @@ - + C0 @@ -16,25 +16,25 @@ - + C1 - + C2 - + master - + iss53 diff --git a/images/basic-branching-3.svg b/images/basic-branching-3.svg index 0830fbc75..cc414b6d2 100644 --- a/images/basic-branching-3.svg +++ b/images/basic-branching-3.svg @@ -7,25 +7,25 @@ - + C0 - + C1 - + C2 - + C3 @@ -34,7 +34,7 @@ - + master @@ -42,7 +42,7 @@ - + iss53 diff --git a/images/basic-branching-4.svg b/images/basic-branching-4.svg index 2fb653cd2..a84e5890b 100644 --- a/images/basic-branching-4.svg +++ b/images/basic-branching-4.svg @@ -9,26 +9,26 @@ - + C0 - + C1 - + C2 - + master @@ -37,21 +37,21 @@ - + hotfix - + C4 - + C3 @@ -59,7 +59,7 @@ - + iss53 diff --git a/images/basic-branching-5.svg b/images/basic-branching-5.svg index fec815f13..b23e8866f 100644 --- a/images/basic-branching-5.svg +++ b/images/basic-branching-5.svg @@ -9,26 +9,26 @@ - + C0 - + C1 - + C2 - + master @@ -37,21 +37,21 @@ - + hotfix - + C4 - + C3 @@ -59,7 +59,7 @@ - + iss53 diff --git a/images/basic-branching-6.svg b/images/basic-branching-6.svg index bdc8c3773..3c9c9b31b 100644 --- a/images/basic-branching-6.svg +++ b/images/basic-branching-6.svg @@ -9,19 +9,19 @@ - + C0 - + C1 - + C2 @@ -30,14 +30,14 @@ - + master - + C4 @@ -45,14 +45,14 @@ - + C5 - + C3 @@ -60,7 +60,7 @@ - + iss53 diff --git a/images/basic-merging-1.svg b/images/basic-merging-1.svg index 39de964e1..0b7784ad1 100644 --- a/images/basic-merging-1.svg +++ b/images/basic-merging-1.svg @@ -9,19 +9,19 @@ - + C0 - + C1 - + C2 @@ -30,27 +30,27 @@ - + master - + C4 - + C5 - + C3 @@ -58,20 +58,20 @@ - + iss53 - + Snapshot to Merge In - + Snapshot to Merge Into - + Common Ancestor diff --git a/images/basic-merging-2.svg b/images/basic-merging-2.svg index bfc23d459..3105f00a3 100644 --- a/images/basic-merging-2.svg +++ b/images/basic-merging-2.svg @@ -9,19 +9,19 @@ - + C0 - + C1 - + C2 @@ -30,14 +30,14 @@ - + master - + C4 @@ -45,7 +45,7 @@ - + C5 @@ -54,13 +54,13 @@ - + C6 - + C3 @@ -68,7 +68,7 @@ - + iss53 diff --git a/images/basic-rebase-1.svg b/images/basic-rebase-1.svg index cc22bd894..6a1551f00 100644 --- a/images/basic-rebase-1.svg +++ b/images/basic-rebase-1.svg @@ -9,19 +9,19 @@ - + C0 - + C1 - + C2 @@ -30,7 +30,7 @@ - + experiment @@ -38,13 +38,13 @@ - + C4 - + C3 @@ -53,7 +53,7 @@ - + master diff --git a/images/basic-rebase-2.svg b/images/basic-rebase-2.svg index 4ea51d14d..e089aa413 100644 --- a/images/basic-rebase-2.svg +++ b/images/basic-rebase-2.svg @@ -8,19 +8,19 @@ - + C0 - + C1 - + C2 @@ -30,14 +30,14 @@ - + experiment - + C4 @@ -45,7 +45,7 @@ - + C3 @@ -53,7 +53,7 @@ - + C5 @@ -61,7 +61,7 @@ - + master diff --git a/images/basic-rebase-3.svg b/images/basic-rebase-3.svg index 415f7f63e..328040a40 100644 --- a/images/basic-rebase-3.svg +++ b/images/basic-rebase-3.svg @@ -8,19 +8,19 @@ - + C0 - + C1 - + C2 @@ -28,7 +28,7 @@ - + experiment @@ -37,7 +37,7 @@ - + C4 @@ -46,7 +46,7 @@ - + C3 @@ -54,7 +54,7 @@ - + C4' @@ -62,7 +62,7 @@ - + master diff --git a/images/basic-rebase-4.svg b/images/basic-rebase-4.svg index 568689932..8bdd1a44e 100644 --- a/images/basic-rebase-4.svg +++ b/images/basic-rebase-4.svg @@ -8,19 +8,19 @@ - + C0 - + C1 - + C2 @@ -28,7 +28,7 @@ - + experiment @@ -37,7 +37,7 @@ - + C3 @@ -45,7 +45,7 @@ - + C4' @@ -53,7 +53,7 @@ - + master diff --git a/images/benevolent-dictator.svg b/images/benevolent-dictator.svg index 48001f2a4..fb53fa717 100644 --- a/images/benevolent-dictator.svg +++ b/images/benevolent-dictator.svg @@ -7,40 +7,40 @@ - + blessed repository - + lieutenant - + lieutenant - + developer public - + developer public - + developer public @@ -58,7 +58,7 @@ - + dictator diff --git a/images/branch-and-history.svg b/images/branch-and-history.svg index 0206e55a6..f6929267f 100644 --- a/images/branch-and-history.svg +++ b/images/branch-and-history.svg @@ -7,27 +7,27 @@ - + Snapshot C - + Snapshot B - + Snapshot A - + f30ab @@ -36,13 +36,13 @@ - + 34ac2 - + 98ca9 @@ -50,19 +50,19 @@ - + master - + HEAD - + v1.0 diff --git a/images/centralized.svg b/images/centralized.svg index a7560ac8e..6eb4aa3f8 100644 --- a/images/centralized.svg +++ b/images/centralized.svg @@ -7,26 +7,26 @@ - + shared repository - + developer - + developer - + developer diff --git a/images/checkout-master.svg b/images/checkout-master.svg index 970719553..568209e34 100644 --- a/images/checkout-master.svg +++ b/images/checkout-master.svg @@ -10,38 +10,38 @@ - + master - + f30ab - + 87ab2 - + 34ac2 - + 98ca9 - + testing @@ -49,7 +49,7 @@ - + HEAD diff --git a/images/clean.svg b/images/clean.svg index e56226ed2..a292e4c64 100644 --- a/images/clean.svg +++ b/images/clean.svg @@ -7,59 +7,59 @@ - + fileA.txt - + fileA.txt' - + fileB.txt' - + fileB.txt - + fileC.rb - + fileC.rb - - Staging Area + + Staging Area - - Working Directory + + Working Directory - - *.txt Filter + + *.txt Filter - + smudge - + clean diff --git a/images/commit-and-tree.svg b/images/commit-and-tree.svg index 4a28a98e5..56d86057b 100644 --- a/images/commit-and-tree.svg +++ b/images/commit-and-tree.svg @@ -6,101 +6,101 @@ - - size - 92ec2 - Scott - Scott + + size + 92ec2 + Scott + Scott - - commit - - tree - author - committer + + commit + + tree + author + committer - + The initial commit of my project - - size - 5b1d3 README - 911e7 LICENSE - cba0a test.rb + + size + 5b1d3 README + 911e7 LICENSE + cba0a test.rb - - tree - - blob - blob - blob + + tree + + blob + blob + blob - - size + + size - - blob + + blob - - == Testing library - - This library is used to test - Ruby projects. + + == Testing library + + This library is used to test + Ruby projects. - - size + + size - - blob + + blob - - The MIT License - - Copyright (c) 2008 Scott Chacon - - Permission is hereby granted, - free of charge, to any person + + The MIT License + + Copyright (c) 2008 Scott Chacon + + Permission is hereby granted, + free of charge, to any person - + size - + blob - - require 'logger' - require 'test/unit' - - - class Test::Unit::TestCase - + + require 'logger' + require 'test/unit' + + + class Test::Unit::TestCase + - + 98ca9 - + 92ec2 - + 5b1d3 - + 911e7 - + cba0a diff --git a/images/commits-and-parents.svg b/images/commits-and-parents.svg index 1e760a25d..c5fa31dfd 100644 --- a/images/commits-and-parents.svg +++ b/images/commits-and-parents.svg @@ -6,14 +6,14 @@ - + size 92ec2 Scott Scott - + commit tree @@ -21,27 +21,27 @@ author committer - + The initial commit of my project - + Snapshot A - + size 184ca 98ca9 Scott Scott - + commit tree @@ -49,35 +49,35 @@ author committer - + Fixed bug #1328 - stack overflow under certain conditions - + Snapshot B - + 98ca9 - + 34ac2 - + size 0de24 34ac2 Scott Scott - + commit tree @@ -85,19 +85,19 @@ author committer - + add feature #32 - ability to add new formats to the central interface - + Snapshot C - + f30ab diff --git a/images/data-model-1.svg b/images/data-model-1.svg index 8f1966802..ef4452c40 100644 --- a/images/data-model-1.svg +++ b/images/data-model-1.svg @@ -6,19 +6,19 @@ - + blob - + blob - + blob @@ -28,37 +28,37 @@ - + simplegit.rb - + Rakefile - + README - + lib - + tree - + tree diff --git a/images/data-model-2.svg b/images/data-model-2.svg index 3474d727c..9b751cc18 100644 --- a/images/data-model-2.svg +++ b/images/data-model-2.svg @@ -6,28 +6,28 @@ - + "version 2" - + 1f7a7a - + "new file" - + fa49b0 - + "version 1" - + 83baae @@ -37,43 +37,43 @@ - + test.txt - + test.txt - + new.txt - + bak - + tree - + 3c4e9c - + tree - + d8329f diff --git a/images/data-model-3.svg b/images/data-model-3.svg index 7ddc523c0..8ffcce222 100644 --- a/images/data-model-3.svg +++ b/images/data-model-3.svg @@ -15,120 +15,120 @@ - + "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.svg b/images/data-model-4.svg index 30f7ba26b..3d07f1cec 100644 --- a/images/data-model-4.svg +++ b/images/data-model-4.svg @@ -15,102 +15,102 @@ - + "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 @@ -118,7 +118,7 @@ - + refs/heads/test @@ -127,26 +127,26 @@ - + refs/heads/master - + tree - + 0155eb - + tree - + d8329f diff --git a/images/deltas.svg b/images/deltas.svg index cf363ccdc..42c351846 100644 --- a/images/deltas.svg +++ b/images/deltas.svg @@ -7,97 +7,97 @@ - + 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 @@ -109,7 +109,7 @@ - + Checkins Over Time diff --git a/images/distributed.svg b/images/distributed.svg index e3fec05bd..9faee1314 100644 --- a/images/distributed.svg +++ b/images/distributed.svg @@ -6,66 +6,66 @@ - + Version Database - + Version 3 - + Version 2 - + Version 1 - + Server Computer - + Version Database - + Version 3 - + Version 2 - + Version 1 - + Computer A - + File @@ -75,36 +75,36 @@ - + Version Database - + Version 3 - + Version 2 - + Version 1 - + Computer B - + File diff --git a/images/double-dot.svg b/images/double-dot.svg index 94acce124..cb98153ce 100644 --- a/images/double-dot.svg +++ b/images/double-dot.svg @@ -6,7 +6,7 @@ - + A @@ -14,7 +14,7 @@ - + B @@ -23,7 +23,7 @@ - + E @@ -33,7 +33,7 @@ - + F @@ -42,7 +42,7 @@ - + C @@ -51,7 +51,7 @@ - + D @@ -60,7 +60,7 @@ - + master @@ -69,7 +69,7 @@ - + experiment diff --git a/images/head-to-master.svg b/images/head-to-master.svg index 4678fba80..4304d05bc 100644 --- a/images/head-to-master.svg +++ b/images/head-to-master.svg @@ -11,37 +11,37 @@ - + master - + testing - + f30ab - + 34ac2 - + 98ca9 - + HEAD diff --git a/images/head-to-testing.svg b/images/head-to-testing.svg index 309cb4d9c..05bdac56e 100644 --- a/images/head-to-testing.svg +++ b/images/head-to-testing.svg @@ -10,38 +10,38 @@ - + master - + testing - + f30ab - + 34ac2 - + 98ca9 - + HEAD diff --git a/images/integration-manager.svg b/images/integration-manager.svg index 678452133..08b161451 100644 --- a/images/integration-manager.svg +++ b/images/integration-manager.svg @@ -7,28 +7,28 @@ - + blessed repository - + integration manager - + developer public - + developer private @@ -36,14 +36,14 @@ - + developer public - + developer private @@ -58,14 +58,14 @@ - + developer public - + developer private diff --git a/images/interesting-rebase-1.svg b/images/interesting-rebase-1.svg index e25b9e0d5..cc9d12f3c 100644 --- a/images/interesting-rebase-1.svg +++ b/images/interesting-rebase-1.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -49,7 +49,7 @@ - + C3 @@ -57,7 +57,7 @@ - + C4 @@ -65,21 +65,21 @@ - + C8 - + C9 - + C10 @@ -87,7 +87,7 @@ - + server @@ -96,7 +96,7 @@ - + client diff --git a/images/interesting-rebase-2.svg b/images/interesting-rebase-2.svg index ba9f8b1de..35caf5b83 100644 --- a/images/interesting-rebase-2.svg +++ b/images/interesting-rebase-2.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,14 +58,14 @@ - + C9' - + C3 @@ -73,7 +73,7 @@ - + C4 @@ -82,14 +82,14 @@ - + C8 - + C9 @@ -97,7 +97,7 @@ - + C10 @@ -105,7 +105,7 @@ - + server @@ -114,7 +114,7 @@ - + client diff --git a/images/interesting-rebase-3.svg b/images/interesting-rebase-3.svg index be8b64f9b..c0ceda4ab 100644 --- a/images/interesting-rebase-3.svg +++ b/images/interesting-rebase-3.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,14 +58,14 @@ - + C9' - + C3 @@ -73,7 +73,7 @@ - + C4 @@ -81,7 +81,7 @@ - + C10 @@ -89,7 +89,7 @@ - + server @@ -98,7 +98,7 @@ - + client diff --git a/images/interesting-rebase-4.svg b/images/interesting-rebase-4.svg index 5c4572e37..a7c979a25 100644 --- a/images/interesting-rebase-4.svg +++ b/images/interesting-rebase-4.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,7 +58,7 @@ - + C9' @@ -66,7 +66,7 @@ - + C3' @@ -75,7 +75,7 @@ - + C4' @@ -83,7 +83,7 @@ - + C10' @@ -91,7 +91,7 @@ - + C3 @@ -99,7 +99,7 @@ - + C4 @@ -107,7 +107,7 @@ - + C10 @@ -116,7 +116,7 @@ - + server @@ -125,7 +125,7 @@ - + client diff --git a/images/interesting-rebase-5.svg b/images/interesting-rebase-5.svg index bdd155e72..99f913cb7 100644 --- a/images/interesting-rebase-5.svg +++ b/images/interesting-rebase-5.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,7 +58,7 @@ - + C9' @@ -66,7 +66,7 @@ - + C3' @@ -75,7 +75,7 @@ - + C4' @@ -83,7 +83,7 @@ - + C10' diff --git a/images/large-merges-1.svg b/images/large-merges-1.svg index c34c0d0de..d7b06d6ad 100644 --- a/images/large-merges-1.svg +++ b/images/large-merges-1.svg @@ -8,7 +8,7 @@ - + master @@ -17,7 +17,7 @@ - + tv/rebase-stat @@ -26,7 +26,7 @@ - + jk/clone-checkout @@ -35,7 +35,7 @@ - + db/push-cleanup @@ -44,7 +44,7 @@ - + js/notes @@ -53,21 +53,21 @@ - + ps/blame - + C1 - + C2 @@ -78,31 +78,31 @@ - + C3 - + C5 - + C7 - + C9 - + C11 @@ -110,7 +110,7 @@ - + C4 @@ -119,7 +119,7 @@ - + C6 @@ -128,7 +128,7 @@ - + C8 @@ -137,7 +137,7 @@ - + C10 @@ -146,7 +146,7 @@ - + C12 diff --git a/images/large-merges-2.svg b/images/large-merges-2.svg index 3d449a886..fb8b4c443 100644 --- a/images/large-merges-2.svg +++ b/images/large-merges-2.svg @@ -8,7 +8,7 @@ - + master @@ -17,7 +17,7 @@ - + tv/rebase-stat @@ -26,7 +26,7 @@ - + jk/clone-checkout @@ -35,7 +35,7 @@ - + db/push-cleanup @@ -44,7 +44,7 @@ - + js/notes @@ -53,7 +53,7 @@ - + pu @@ -62,7 +62,7 @@ - + next @@ -71,21 +71,21 @@ - + ps/blame - + C1 - + C2 @@ -100,31 +100,31 @@ - + C3 - + C5 - + C7 - + C9 - + C11 @@ -132,7 +132,7 @@ - + C4 @@ -140,35 +140,35 @@ - + C16 - + C17 - + C13 - + C14 - + C15 @@ -176,7 +176,7 @@ - + C6 @@ -185,7 +185,7 @@ - + C8 @@ -194,7 +194,7 @@ - + C10 @@ -203,7 +203,7 @@ - + C12 diff --git a/images/lifecycle.svg b/images/lifecycle.svg index 44516aa26..10e44c9f8 100644 --- a/images/lifecycle.svg +++ b/images/lifecycle.svg @@ -13,7 +13,7 @@ - + Modified @@ -22,36 +22,36 @@ - + Edit the file - + Add the file - + Remove the file - + Stage the file - + Untracked - + Unmodified - + Commit - + Staged diff --git a/images/local.svg b/images/local.svg index de06b1d86..59d7a0958 100644 --- a/images/local.svg +++ b/images/local.svg @@ -6,37 +6,37 @@ - + Local Computer - + Version Database - + Checkout - + File - + Version 3 - + Version 2 - + Version 1 diff --git a/images/lr-branches-1.svg b/images/lr-branches-1.svg index 1dd08f711..68b9604a6 100644 --- a/images/lr-branches-1.svg +++ b/images/lr-branches-1.svg @@ -6,70 +6,70 @@ - + C1 - + C2 - + C3 - + C4 - + C5 - + C6 - + C7 - + master - + develop - + topic diff --git a/images/lr-branches-2.svg b/images/lr-branches-2.svg index 1a5296921..5f3b4c8eb 100644 --- a/images/lr-branches-2.svg +++ b/images/lr-branches-2.svg @@ -14,7 +14,7 @@ - + C1 @@ -22,51 +22,51 @@ - + C2 - + C3 - + C4 - + C5 - + C6 - + C7 - + master - + develop - + topic diff --git a/images/managed-team-1.svg b/images/managed-team-1.svg index fbb0a58fd..6e47fe556 100644 --- a/images/managed-team-1.svg +++ b/images/managed-team-1.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -29,14 +29,14 @@ - + 85127 - + e5b0f @@ -44,7 +44,7 @@ - + featureB @@ -53,7 +53,7 @@ - + master @@ -62,7 +62,7 @@ - + featureA diff --git a/images/managed-team-2.svg b/images/managed-team-2.svg index c080d4221..b3582daa6 100644 --- a/images/managed-team-2.svg +++ b/images/managed-team-2.svg @@ -7,14 +7,14 @@ - + 4b078 - + 1edee @@ -22,7 +22,7 @@ - + 33009 @@ -31,7 +31,7 @@ - + aad88 @@ -40,7 +40,7 @@ - + 774b3 @@ -49,7 +49,7 @@ - + 85127 @@ -57,21 +57,21 @@ - + cd685 - + fba9a - + e5b0f @@ -81,7 +81,7 @@ - + origin/ featureBee @@ -91,7 +91,7 @@ - + featureB @@ -100,7 +100,7 @@ - + master @@ -111,7 +111,7 @@ - + origin/ featureA @@ -121,7 +121,7 @@ - + featureA diff --git a/images/managed-team-3.svg b/images/managed-team-3.svg index 3af1b2519..61ba47ed3 100644 --- a/images/managed-team-3.svg +++ b/images/managed-team-3.svg @@ -8,14 +8,14 @@ - + 4b078 - + 1edee @@ -23,7 +23,7 @@ - + 33009 @@ -32,7 +32,7 @@ - + aad88 @@ -41,7 +41,7 @@ - + 774b3 @@ -49,7 +49,7 @@ - + 5399e @@ -57,7 +57,7 @@ - + 85127 @@ -65,21 +65,21 @@ - + cd685 - + fba9a - + e5b0f @@ -89,7 +89,7 @@ - + origin/ featureBee @@ -99,7 +99,7 @@ - + featureB @@ -108,7 +108,7 @@ - + master @@ -119,7 +119,7 @@ - + origin/ featureA @@ -131,7 +131,7 @@ - + origin/ master @@ -141,7 +141,7 @@ - + featureA diff --git a/images/managed-team-flow.svg b/images/managed-team-flow.svg index e1638b816..ef5f6c398 100644 --- a/images/managed-team-flow.svg +++ b/images/managed-team-flow.svg @@ -6,54 +6,54 @@ - + Josie - + Josie - + John - + John - + Jessica - + Jessica - + server: featureA - + server: featureA @@ -61,86 +61,86 @@ - + server: featureBee - + server: featureBee - + 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) diff --git a/images/merging-workflows-1.svg b/images/merging-workflows-1.svg index b9c12f0d8..22852505d 100644 --- a/images/merging-workflows-1.svg +++ b/images/merging-workflows-1.svg @@ -7,7 +7,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -24,7 +24,7 @@ - + C7 @@ -32,7 +32,7 @@ - + C3 @@ -41,7 +41,7 @@ - + C4 @@ -50,7 +50,7 @@ - + C5 @@ -59,7 +59,7 @@ - + C6 @@ -68,7 +68,7 @@ - + master @@ -77,7 +77,7 @@ - + ruby_client @@ -86,7 +86,7 @@ - + php_client diff --git a/images/merging-workflows-2.svg b/images/merging-workflows-2.svg index 1bc25de6e..dfc71b993 100644 --- a/images/merging-workflows-2.svg +++ b/images/merging-workflows-2.svg @@ -7,7 +7,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -24,7 +24,7 @@ - + C7 @@ -32,7 +32,7 @@ - + C3 @@ -41,7 +41,7 @@ - + C4 @@ -50,7 +50,7 @@ - + C9 @@ -59,7 +59,7 @@ - + C8 @@ -68,7 +68,7 @@ - + C5 @@ -76,7 +76,7 @@ - + C6 @@ -84,7 +84,7 @@ - + master @@ -93,7 +93,7 @@ - + ruby_client @@ -102,7 +102,7 @@ - + php_client diff --git a/images/merging-workflows-3.svg b/images/merging-workflows-3.svg index 5481cbd1f..7d0fa5a4c 100644 --- a/images/merging-workflows-3.svg +++ b/images/merging-workflows-3.svg @@ -7,7 +7,7 @@ - + C1 @@ -15,14 +15,14 @@ - + C2 - + C5 @@ -30,7 +30,7 @@ - + C3 @@ -38,7 +38,7 @@ - + C4 @@ -46,7 +46,7 @@ - + develop @@ -55,7 +55,7 @@ - + master @@ -64,7 +64,7 @@ - + ruby_client diff --git a/images/merging-workflows-4.svg b/images/merging-workflows-4.svg index d367ab9d9..72bc895f2 100644 --- a/images/merging-workflows-4.svg +++ b/images/merging-workflows-4.svg @@ -7,7 +7,7 @@ - + C1 @@ -15,14 +15,14 @@ - + C2 - + C5 @@ -30,7 +30,7 @@ - + C3 @@ -39,7 +39,7 @@ - + C4 @@ -48,7 +48,7 @@ - + C6 @@ -56,7 +56,7 @@ - + develop @@ -65,7 +65,7 @@ - + master @@ -74,7 +74,7 @@ - + ruby_client diff --git a/images/merging-workflows-5.svg b/images/merging-workflows-5.svg index 1463bb831..1d59404a4 100644 --- a/images/merging-workflows-5.svg +++ b/images/merging-workflows-5.svg @@ -7,7 +7,7 @@ - + C1 @@ -15,14 +15,14 @@ - + C2 - + C5 @@ -30,7 +30,7 @@ - + C3 @@ -39,7 +39,7 @@ - + C4 @@ -48,7 +48,7 @@ - + C6 @@ -56,7 +56,7 @@ - + develop @@ -65,7 +65,7 @@ - + master @@ -74,7 +74,7 @@ - + ruby_client diff --git a/images/perils-of-rebasing-1.svg b/images/perils-of-rebasing-1.svg index baa3ce544..05a47ba8d 100644 --- a/images/perils-of-rebasing-1.svg +++ b/images/perils-of-rebasing-1.svg @@ -8,34 +8,34 @@ - + C1 - + master - + C1 - + C2 - + C3 @@ -43,7 +43,7 @@ - + master @@ -52,15 +52,15 @@ - + teamone/master - + My Computer - + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-2.svg b/images/perils-of-rebasing-2.svg index 3a99c2073..ac0b8934d 100644 --- a/images/perils-of-rebasing-2.svg +++ b/images/perils-of-rebasing-2.svg @@ -9,7 +9,7 @@ - + C1 @@ -17,21 +17,21 @@ - + master - + C1 - + C2 @@ -39,7 +39,7 @@ - + C3 @@ -48,7 +48,7 @@ - + C7 @@ -57,7 +57,7 @@ - + C4 @@ -66,7 +66,7 @@ - + C5 @@ -74,7 +74,7 @@ - + C6 @@ -83,7 +83,7 @@ - + C4 @@ -92,7 +92,7 @@ - + C5 @@ -100,7 +100,7 @@ - + C6 @@ -109,7 +109,7 @@ - + master @@ -118,15 +118,15 @@ - + teamone/master - + My Computer - + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-3.svg b/images/perils-of-rebasing-3.svg index d79c51e36..cea3ed200 100644 --- a/images/perils-of-rebasing-3.svg +++ b/images/perils-of-rebasing-3.svg @@ -9,7 +9,7 @@ - + C1 @@ -17,21 +17,21 @@ - + master - + C1 - + C2 @@ -39,7 +39,7 @@ - + C3 @@ -48,7 +48,7 @@ - + C7 @@ -57,7 +57,7 @@ - + C4' @@ -66,7 +66,7 @@ - + C4' @@ -74,7 +74,7 @@ - + C5 @@ -83,7 +83,7 @@ - + C4 @@ -93,7 +93,7 @@ - + C6 @@ -103,7 +103,7 @@ - + C4 @@ -112,7 +112,7 @@ - + C5 @@ -120,7 +120,7 @@ - + C6 @@ -129,7 +129,7 @@ - + master @@ -138,15 +138,15 @@ - + teamone/master - + My Computer - + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-4.svg b/images/perils-of-rebasing-4.svg index 39f3cc153..70aa7d11b 100644 --- a/images/perils-of-rebasing-4.svg +++ b/images/perils-of-rebasing-4.svg @@ -10,7 +10,7 @@ - + C1 @@ -18,21 +18,21 @@ - + master - + C1 - + C2 @@ -40,7 +40,7 @@ - + C3 @@ -49,7 +49,7 @@ - + C7 @@ -58,7 +58,7 @@ - + C8 @@ -67,7 +67,7 @@ - + C4' @@ -76,7 +76,7 @@ - + C4' @@ -84,7 +84,7 @@ - + C5 @@ -93,7 +93,7 @@ - + C4 @@ -103,7 +103,7 @@ - + C6 @@ -113,7 +113,7 @@ - + C4 @@ -122,7 +122,7 @@ - + C5 @@ -130,7 +130,7 @@ - + C6 @@ -139,7 +139,7 @@ - + master @@ -148,15 +148,15 @@ - + teamone/master - + My Computer - + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-5.svg b/images/perils-of-rebasing-5.svg index ebe515f08..058849b53 100644 --- a/images/perils-of-rebasing-5.svg +++ b/images/perils-of-rebasing-5.svg @@ -8,7 +8,7 @@ - + C1 @@ -16,14 +16,14 @@ - + master - + C1 @@ -31,7 +31,7 @@ - + C4' @@ -40,21 +40,21 @@ - + C4' - + C2' - + C3' @@ -62,7 +62,7 @@ - + C5 @@ -71,7 +71,7 @@ - + C4 @@ -81,7 +81,7 @@ - + C6 @@ -90,7 +90,7 @@ - + C5 @@ -98,7 +98,7 @@ - + master @@ -107,15 +107,15 @@ - + teamone/master - + My Computer - + git.team1.ourcompany.com diff --git a/images/public-small-1.svg b/images/public-small-1.svg index 19ae0fe9f..984dcd655 100644 --- a/images/public-small-1.svg +++ b/images/public-small-1.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -30,7 +30,7 @@ - + 0d708 @@ -38,14 +38,14 @@ - + e5b0f - + a2de3 @@ -53,7 +53,7 @@ - + master @@ -64,7 +64,7 @@ - + origin/ master @@ -74,7 +74,7 @@ - + featureA @@ -83,7 +83,7 @@ - + featureB diff --git a/images/public-small-2.svg b/images/public-small-2.svg index eea0e7152..52c9ca208 100644 --- a/images/public-small-2.svg +++ b/images/public-small-2.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -30,7 +30,7 @@ - + 5399e @@ -38,14 +38,14 @@ - + e5b0f - + dee6b @@ -53,7 +53,7 @@ - + master @@ -64,7 +64,7 @@ - + origin/ master @@ -74,7 +74,7 @@ - + featureA @@ -83,7 +83,7 @@ - + featureB diff --git a/images/public-small-3.svg b/images/public-small-3.svg index b182ad659..e748e36ba 100644 --- a/images/public-small-3.svg +++ b/images/public-small-3.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -30,7 +30,7 @@ - + 5399e @@ -39,7 +39,7 @@ - + 17f4d @@ -47,14 +47,14 @@ - + e5b0f - + dee6b @@ -62,7 +62,7 @@ - + master @@ -73,7 +73,7 @@ - + origin/ master @@ -83,7 +83,7 @@ - + featureA @@ -92,7 +92,7 @@ - + featureB @@ -101,7 +101,7 @@ - + featureBv2 diff --git a/images/rebasing-1.svg b/images/rebasing-1.svg index 153369370..99232aa8a 100644 --- a/images/rebasing-1.svg +++ b/images/rebasing-1.svg @@ -7,7 +7,7 @@ - + 0b743 @@ -15,14 +15,14 @@ - + a6b4c - + f42c5 @@ -30,7 +30,7 @@ - + e43a6 @@ -38,7 +38,7 @@ - + 5ddae @@ -46,7 +46,7 @@ - + master @@ -55,7 +55,7 @@ - + ruby_client diff --git a/images/rebasing-2.svg b/images/rebasing-2.svg index 27e9ab797..d64b41fcd 100644 --- a/images/rebasing-2.svg +++ b/images/rebasing-2.svg @@ -7,7 +7,7 @@ - + 0b743 @@ -15,7 +15,7 @@ - + a6b4c @@ -23,7 +23,7 @@ - + f42c5 @@ -31,7 +31,7 @@ - + a0a41 @@ -39,7 +39,7 @@ - + master @@ -51,14 +51,14 @@ - + e43a6 - + 5ddae @@ -66,7 +66,7 @@ - + ruby_client diff --git a/images/remote-branches-1.svg b/images/remote-branches-1.svg index 86f37d757..2ddcc1398 100644 --- a/images/remote-branches-1.svg +++ b/images/remote-branches-1.svg @@ -8,14 +8,14 @@ - + 0b743 - + a6b4c @@ -23,27 +23,27 @@ - + f4265 - + master - + 0b743 - + a6b4c @@ -51,36 +51,36 @@ - + f4265 - + master - + origin/master - + My Computer - + git.ourcompany.com - + git clone janedoe@git.ourcompany.com:project.git - + Remote branch - + Local branch diff --git a/images/remote-branches-2.svg b/images/remote-branches-2.svg index b7aa89e5b..f44f8e5b4 100644 --- a/images/remote-branches-2.svg +++ b/images/remote-branches-2.svg @@ -6,35 +6,35 @@ - + 0b743 - + a6b4c - + f4265 - + 31b8e - + 190a3 @@ -42,7 +42,7 @@ - + master @@ -50,35 +50,35 @@ - + 0b743 - + a6b4c - + f4265 - + a38de - + 893cf @@ -86,28 +86,28 @@ - + master - + origin/master - + My Computer - + git.ourcompany.com - + Someone else pushes diff --git a/images/remote-branches-3.svg b/images/remote-branches-3.svg index ca9191dea..89fbc2a72 100644 --- a/images/remote-branches-3.svg +++ b/images/remote-branches-3.svg @@ -6,35 +6,35 @@ - + 0b743 - + a6b4c - + f4265 - + 31b8e - + 190a3 @@ -42,21 +42,21 @@ - + master - + 0b743 - + a6b4c @@ -64,7 +64,7 @@ - + f4265 @@ -73,27 +73,27 @@ - + 31b8e - + 190a3 - + a38de - + 893cf @@ -101,7 +101,7 @@ - + master @@ -110,21 +110,21 @@ - + origin/master - + My Computer - + git.ourcompany.com - + git fetch origin diff --git a/images/remote-branches-4.svg b/images/remote-branches-4.svg index b63112e61..5c48714a4 100644 --- a/images/remote-branches-4.svg +++ b/images/remote-branches-4.svg @@ -7,14 +7,14 @@ - + 0b743 - + a6b4c @@ -22,7 +22,7 @@ - + f4265 @@ -31,27 +31,27 @@ - + 31b8e - + 190a3 - + a38de - + 893cf @@ -59,7 +59,7 @@ - + master @@ -68,38 +68,38 @@ - + origin/master - + My Computer - + git remote add teamone git://git.team1.ourcompany.com - + f4265 - + 31b8e - + 190a3 @@ -107,30 +107,30 @@ - + master - + git.ourcompany.com - + origin - + f4265 - + 31b8e @@ -138,16 +138,16 @@ - + master - + git.team1.ourcompany.com - + teamone diff --git a/images/remote-branches-5.svg b/images/remote-branches-5.svg index b27d48322..20034c71a 100644 --- a/images/remote-branches-5.svg +++ b/images/remote-branches-5.svg @@ -6,14 +6,14 @@ - + 0b743 - + a6b4c @@ -21,7 +21,7 @@ - + f4265 @@ -30,27 +30,27 @@ - + 31b8e - + 190a3 - + a38de - + 893cf @@ -58,7 +58,7 @@ - + master @@ -67,7 +67,7 @@ - + origin/master @@ -76,16 +76,16 @@ - + teamone/master - + My Computer - + git fetch teamone @@ -93,21 +93,21 @@ - + f4265 - + 31b8e - + 190a3 @@ -115,30 +115,30 @@ - + master - + git.ourcompany.com - + origin - + f4265 - + 31b8e @@ -146,16 +146,16 @@ - + master - + git.team1.ourcompany.com - + teamone diff --git a/images/replace1.svg b/images/replace1.svg index acce1ce17..8527e6f0b 100644 --- a/images/replace1.svg +++ b/images/replace1.svg @@ -8,55 +8,55 @@ - + ef989 - + fifth - + c6e1e - + fourth - + 9c68f - + third - + 94570 - + second - + c1822 - + first - + master diff --git a/images/replace2.svg b/images/replace2.svg index 11e62981b..856ce0744 100644 --- a/images/replace2.svg +++ b/images/replace2.svg @@ -8,62 +8,62 @@ - + ef989 - + fifth - + c6e1e - + fourth - + 9c68f - + third - + 94570 - + second - + c1822 - + first - + master - + history diff --git a/images/replace3.svg b/images/replace3.svg index 617910226..880b94db0 100644 --- a/images/replace3.svg +++ b/images/replace3.svg @@ -7,65 +7,65 @@ - + ef989 - + fifth - + c6e1e - + fourth - + 9c68f - + third - + 94570 - + second - + c1822 - + 622e8 - + first - + instructions - + history diff --git a/images/replace4.svg b/images/replace4.svg index a8fc4b82d..02a14a547 100644 --- a/images/replace4.svg +++ b/images/replace4.svg @@ -17,7 +17,7 @@ - + r e b @@ -27,92 +27,92 @@ - + ef989 - + fifth - + c6e1e - + fourth - + 9c68f - + third - + e146b - + fifth - + 81a70 - + fourth - + 94570 - + second - + c1822 - + 622e8 - + first - + instructions - + history - + master diff --git a/images/replace5.svg b/images/replace5.svg index 428132f58..999f4f330 100644 --- a/images/replace5.svg +++ b/images/replace5.svg @@ -7,60 +7,60 @@ - + e146b - + fifth - + replace - + 81a70 - + fourth - + third - + 622e8 - + c6e1e - + instructions - + 9c68f - + 94570 - + second @@ -68,28 +68,28 @@ - + master - + c1822 - + fourth - + third - + first - + history diff --git a/images/rerere1.svg b/images/rerere1.svg index 1ad479db4..92803c2d8 100644 --- a/images/rerere1.svg +++ b/images/rerere1.svg @@ -16,32 +16,32 @@ - + master - + hello world - + hola world - + hello mundo - + i18-world diff --git a/images/rerere2.svg b/images/rerere2.svg index 98af04ad0..150f3a67b 100644 --- a/images/rerere2.svg +++ b/images/rerere2.svg @@ -18,47 +18,47 @@ - + master - + hello world - + hola world - + hola mundo - + hello mundo - + i18-world - + rerere cache - + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ diff --git a/images/rerere3.svg b/images/rerere3.svg index e1a28c94d..72093810d 100644 --- a/images/rerere3.svg +++ b/images/rerere3.svg @@ -17,56 +17,56 @@ - + master - + hello world - + hola world - + hola mundo - + hello mundo - + i18-world - + rerere cache - + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ - + hello mundo - + rebase diff --git a/images/reset-checkout.svg b/images/reset-checkout.svg index 9531e6e5b..293dbe396 100644 --- a/images/reset-checkout.svg +++ b/images/reset-checkout.svg @@ -8,14 +8,14 @@ - + commit A - + commit B @@ -23,7 +23,7 @@ - + master @@ -32,7 +32,7 @@ - + develop @@ -41,13 +41,13 @@ - + HEAD - + before command @@ -55,14 +55,14 @@ - + commit A - + commit B @@ -70,7 +70,7 @@ - + master @@ -79,7 +79,7 @@ - + develop @@ -88,33 +88,33 @@ - + HEAD - + after reset - + after checkout - + commit A - + commit B @@ -122,7 +122,7 @@ - + master @@ -131,7 +131,7 @@ - + develop @@ -140,7 +140,7 @@ - + HEAD diff --git a/images/reset-ex1.svg b/images/reset-ex1.svg index b51cd777c..7f8ec6751 100644 --- a/images/reset-ex1.svg +++ b/images/reset-ex1.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,27 +38,27 @@ - + HEAD - + master - + ? - + Git Repository - + file.txt v1 diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg index 0234a25c6..5763a4877 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,39 +38,39 @@ - + HEAD - + master - + ? - + Git Repository - + file.txt v1 - + file.txt v1 - + git add diff --git a/images/reset-ex3.svg b/images/reset-ex3.svg index 09151880b..ab87a8227 100644 --- a/images/reset-ex3.svg +++ b/images/reset-ex3.svg @@ -9,7 +9,7 @@ - + Working Directory @@ -19,7 +19,7 @@ - + Index @@ -29,7 +29,7 @@ - + HEAD @@ -39,56 +39,56 @@ - + HEAD - + master - + Git Repository - + file.txt v1 - + file.txt v1 - + file.txt v1 - + file.txt v1 - + git commit - + eb43bf8 - + eb43bf8 diff --git a/images/reset-ex4.svg b/images/reset-ex4.svg index 96208b62d..effd8a6a3 100644 --- a/images/reset-ex4.svg +++ b/images/reset-ex4.svg @@ -9,7 +9,7 @@ - + Working Directory @@ -19,7 +19,7 @@ - + Index @@ -29,7 +29,7 @@ - + HEAD @@ -39,56 +39,56 @@ - + HEAD - + master - + Git Repository - + file.txt v2 - + file.txt v1 - + file.txt v1 - + file.txt v1 - + edit file - + eb43bf8 - + eb43bf8 diff --git a/images/reset-ex5.svg b/images/reset-ex5.svg index 43992d53b..ffc64c988 100644 --- a/images/reset-ex5.svg +++ b/images/reset-ex5.svg @@ -9,7 +9,7 @@ - + Working Directory @@ -19,7 +19,7 @@ - + Index @@ -29,7 +29,7 @@ - + HEAD @@ -39,56 +39,56 @@ - + HEAD - + master - + Git Repository - + file.txt v2 - + file.txt v2 - + file.txt v1 - + file.txt v1 - + git add - + eb43bf8 - + eb43bf8 diff --git a/images/reset-ex6.svg b/images/reset-ex6.svg index 747b01a45..1c58f566a 100644 --- a/images/reset-ex6.svg +++ b/images/reset-ex6.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,71 +38,71 @@ - + HEAD - + master - + Git Repository - + file.txt v2 - + file.txt v2 - + file.txt v2 - + git commit - + 9e5e6a4 - + file.txt v1 - + eb43bf8 - + file.txt v2 - + 9e5e6a4 diff --git a/images/reset-hard.svg b/images/reset-hard.svg index 5eff6b325..d788cc951 100644 --- a/images/reset-hard.svg +++ b/images/reset-hard.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,98 +38,98 @@ - + HEAD - + master - + Git Repository - + file.txt v2 - + file.txt v2 - + file.txt v2 - + git reset --hard HEAD~ - + 9e5e6a4 - + file.txt v1 - + eb43bf8 - + file.txt v2 - + 9e5e6a4 - + file.txt v3 - + 38eb946 - + 2 - + 3 - + 1 diff --git a/images/reset-mixed.svg b/images/reset-mixed.svg index 4cc100453..21df50614 100644 --- a/images/reset-mixed.svg +++ b/images/reset-mixed.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,94 +38,94 @@ - + HEAD - + master - + Git Repository - + file.txt v3 - + file.txt v2 - + file.txt v2 - + git reset [--mixed] HEAD~ - + 9e5e6a4 - + file.txt v1 - + eb43bf8 - + file.txt v2 - + 9e5e6a4 - + file.txt v3 - + 38eb946 - + 2 - + 1 diff --git a/images/reset-path1.svg b/images/reset-path1.svg index c52a1ec1a..2aa4375eb 100644 --- a/images/reset-path1.svg +++ b/images/reset-path1.svg @@ -9,7 +9,7 @@ - + Working Directory @@ -19,7 +19,7 @@ - + Index @@ -29,7 +29,7 @@ - + HEAD @@ -39,38 +39,38 @@ - + HEAD - + master - + Git Repository - + file.txt v2 - + file.txt v1 - + file.txt v1 @@ -78,18 +78,18 @@ - + file.txt v1 - + git reset file.txt - + eb43bf8 - + eb43bf8 diff --git a/images/reset-path2.svg b/images/reset-path2.svg index 2e4f059bb..78c2e126b 100644 --- a/images/reset-path2.svg +++ b/images/reset-path2.svg @@ -9,7 +9,7 @@ - + Working Directory @@ -19,7 +19,7 @@ - + Index @@ -29,7 +29,7 @@ - + HEAD @@ -39,38 +39,38 @@ - + HEAD - + master - + Git Repository - + file.txt v2 - + file.txt v2 - + file.txt v1 @@ -78,18 +78,18 @@ - + file.txt v1 - + git add file.txt - + eb43bf8 - + eb43bf8 diff --git a/images/reset-path3.svg b/images/reset-path3.svg index 960192eba..e57da4ae2 100644 --- a/images/reset-path3.svg +++ b/images/reset-path3.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,63 +38,63 @@ - + HEAD - + master - + Git Repository - + git reset eb43 -- file.txt - + 38eb946 - + file.txt v1 - + eb43bf8 - + file.txt v2 - + 9e5e6a4 - + file.txt v3 - + 38eb946 @@ -102,21 +102,21 @@ - + file.txt v1 - + file.txt v3 - + file.txt v3 diff --git a/images/reset-soft.svg b/images/reset-soft.svg index 0aadf7e18..d9a37694f 100644 --- a/images/reset-soft.svg +++ b/images/reset-soft.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,84 +38,84 @@ - + HEAD - + master - + Git Repository - + file.txt v3 - + file.txt v3 - + file.txt v2 - + git reset --soft HEAD~ - + 9e5e6a4 - + file.txt v1 - + eb43bf8 - + file.txt v2 - + 9e5e6a4 - + file.txt v3 - + 38eb946 diff --git a/images/reset-squash-r1.svg b/images/reset-squash-r1.svg index 6754840f6..7012b15e3 100644 --- a/images/reset-squash-r1.svg +++ b/images/reset-squash-r1.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,33 +38,33 @@ - + HEAD - + master - + Git Repository - + 38eb946 - + file-a.txt v1 - + eb43bf8 @@ -72,36 +72,36 @@ - + 9e5e6a4 - + file-a.txt v2 - + file-b.txt v1 - + 38eb946 - + file-a.txt v3 - + file-b.txt v1 @@ -109,13 +109,13 @@ - + file-a.txt v3 - + file-b.txt v1 @@ -123,13 +123,13 @@ - + file-a.txt v3 - + file-b.txt v1 @@ -137,13 +137,13 @@ - + file-a.txt v3 - + file-b.txt v1 diff --git a/images/reset-squash-r2.svg b/images/reset-squash-r2.svg index 80c08e846..86d097f27 100644 --- a/images/reset-squash-r2.svg +++ b/images/reset-squash-r2.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,36 +38,36 @@ - + HEAD - + master - + Git Repository - + git reset --soft HEAD~2 - + eb43bf8 - + file-a.txt v1 - + eb43bf8 @@ -75,36 +75,36 @@ - + 9e5e6a4 - + file-a.txt v2 - + file-b.txt v1 - + 38eb946 - + file-a.txt v3 - + file-b.txt v1 @@ -112,13 +112,13 @@ - + file-a.txt v3 - + file-b.txt v1 @@ -126,20 +126,20 @@ - + file-a.txt v3 - + file-b.txt v1 - + file-a.txt v1 diff --git a/images/reset-squash-r3.svg b/images/reset-squash-r3.svg index ac5812873..9324a0d74 100644 --- a/images/reset-squash-r3.svg +++ b/images/reset-squash-r3.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,36 +38,36 @@ - + HEAD - + master - + Git Repository - + git commit - + 68aef35 - + file-a.txt v1 - + eb43bf8 @@ -75,54 +75,54 @@ - + 9e5e6a4 - + file-a.txt v2 - + file-b.txt v1 - + 38eb946 - + file-a.txt v3 - + file-b.txt v1 - + 68aef35 - + file-a.txt v3 - + file-b.txt v1 @@ -130,13 +130,13 @@ - + file-a.txt v3 - + file-b.txt v1 @@ -144,13 +144,13 @@ - + file-a.txt v3 - + file-b.txt v1 @@ -158,13 +158,13 @@ - + file-a.txt v3 - + file-b.txt v1 diff --git a/images/reset-start.svg b/images/reset-start.svg index 0664945e9..79e72536a 100644 --- a/images/reset-start.svg +++ b/images/reset-start.svg @@ -8,7 +8,7 @@ - + Working Directory @@ -18,7 +18,7 @@ - + Index @@ -28,7 +28,7 @@ - + HEAD @@ -38,81 +38,81 @@ - + HEAD - + master - + Git Repository - + file.txt v3 - + file.txt v3 - + file.txt v3 - + 38eb946 - + file.txt v1 - + eb43bf8 - + file.txt v2 - + 9e5e6a4 - + file.txt v3 - + 38eb946 diff --git a/images/reset-workflow.svg b/images/reset-workflow.svg index 1bd0567d2..b9b062865 100644 --- a/images/reset-workflow.svg +++ b/images/reset-workflow.svg @@ -9,33 +9,33 @@ - + Working Directory - + Index - + HEAD - + Checkout the project - + Stage Files - + Commit diff --git a/images/small-team-1.svg b/images/small-team-1.svg index af5fff642..e131f6e56 100644 --- a/images/small-team-1.svg +++ b/images/small-team-1.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + 738ee @@ -31,7 +31,7 @@ - + fbff5 @@ -39,7 +39,7 @@ - + origin/master @@ -48,7 +48,7 @@ - + master diff --git a/images/small-team-2.svg b/images/small-team-2.svg index a8296d6d6..923ebc9a2 100644 --- a/images/small-team-2.svg +++ b/images/small-team-2.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + 738ee @@ -32,14 +32,14 @@ - + 72bbc - + fbff5 @@ -47,7 +47,7 @@ - + origin/master @@ -56,7 +56,7 @@ - + master diff --git a/images/small-team-3.svg b/images/small-team-3.svg index 4f3478e75..f8d77a409 100644 --- a/images/small-team-3.svg +++ b/images/small-team-3.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + 738ee @@ -32,14 +32,14 @@ - + 72bbc - + fbff5 @@ -48,7 +48,7 @@ - + origin/master @@ -58,7 +58,7 @@ - + master diff --git a/images/small-team-4.svg b/images/small-team-4.svg index d2ced1a1c..483f09b6d 100644 --- a/images/small-team-4.svg +++ b/images/small-team-4.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 8149a @@ -41,7 +41,7 @@ - + 23ac6 @@ -49,7 +49,7 @@ - + 4af42 @@ -57,7 +57,7 @@ - + origin/master @@ -66,7 +66,7 @@ - + master @@ -75,7 +75,7 @@ - + issue54 diff --git a/images/small-team-5.svg b/images/small-team-5.svg index 491c17f6e..176ade32d 100644 --- a/images/small-team-5.svg +++ b/images/small-team-5.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 738ee @@ -41,7 +41,7 @@ - + 72bbc @@ -49,7 +49,7 @@ - + 8149a @@ -58,7 +58,7 @@ - + 23ac6 @@ -66,7 +66,7 @@ - + 4af42 @@ -74,7 +74,7 @@ - + origin/master @@ -83,7 +83,7 @@ - + master @@ -92,7 +92,7 @@ - + issue54 diff --git a/images/small-team-6.svg b/images/small-team-6.svg index 90feda18a..52ebe499d 100644 --- a/images/small-team-6.svg +++ b/images/small-team-6.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 738ee @@ -41,7 +41,7 @@ - + 72bbc @@ -49,7 +49,7 @@ - + 8059c @@ -57,7 +57,7 @@ - + 8149a @@ -66,7 +66,7 @@ - + 23ac6 @@ -74,7 +74,7 @@ - + 4af42 @@ -82,7 +82,7 @@ - + origin/master @@ -91,7 +91,7 @@ - + master @@ -100,7 +100,7 @@ - + issue54 diff --git a/images/small-team-7.svg b/images/small-team-7.svg index c6c4f1717..f0274abed 100644 --- a/images/small-team-7.svg +++ b/images/small-team-7.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 738ee @@ -41,7 +41,7 @@ - + 72bbc @@ -49,7 +49,7 @@ - + 8059c @@ -57,7 +57,7 @@ - + 8149a @@ -66,7 +66,7 @@ - + 23ac6 @@ -74,7 +74,7 @@ - + 4af42 @@ -82,7 +82,7 @@ - + origin/master @@ -91,7 +91,7 @@ - + master @@ -100,7 +100,7 @@ - + issue54 diff --git a/images/small-team-flow.svg b/images/small-team-flow.svg index 0c47400d2..5a5a1bbf3 100644 --- a/images/small-team-flow.svg +++ b/images/small-team-flow.svg @@ -6,19 +6,19 @@ - + Server - + John - + Jessica @@ -26,68 +26,68 @@ - + 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.svg b/images/smudge.svg index f825bd91b..d3203c513 100644 --- a/images/smudge.svg +++ b/images/smudge.svg @@ -7,59 +7,59 @@ - + 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.svg b/images/snapshots.svg index 06ccacd72..a098ed596 100644 --- a/images/snapshots.svg +++ b/images/snapshots.svg @@ -34,132 +34,132 @@ - + Version 1 - + Version 2 - + Version 3 - + Version 4 - + Version 5 - + File A - + File A - + A1 - + C1 - + C2 - + B1 - + B - + A1 - + A2 - + B - + C2 - + A2 - + B2 - + C3 - + File B - + File C - + Checkins Over Time diff --git a/images/symbols.svg b/images/symbols.svg index 8fd4aa02a..01d3c2454 100644 --- a/images/symbols.svg +++ b/images/symbols.svg @@ -6,108 +6,108 @@ - + 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 @@ -117,13 +117,13 @@ - + size - + blob - + == Testing library This library is used to test @@ -132,25 +132,25 @@ - + hello mundo - + fbff5 - + 738ee - + fba9a diff --git a/images/topic-branches-1.svg b/images/topic-branches-1.svg index 4fdba76d4..fcbbbea68 100644 --- a/images/topic-branches-1.svg +++ b/images/topic-branches-1.svg @@ -6,122 +6,122 @@ - + 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.svg b/images/topic-branches-2.svg index a1faa101c..8b61b5c6c 100644 --- a/images/topic-branches-2.svg +++ b/images/topic-branches-2.svg @@ -6,56 +6,56 @@ - + C0 - + C1 - + C3 - + C9 - + C10 - + C2 - + C4 - + C13 @@ -63,53 +63,53 @@ - + C14 - + C12 - + master - + C7 - + C8 - + C11 - + iss91v2 - + dumbidea diff --git a/images/two-branches.svg b/images/two-branches.svg index e5ca2f12c..9fe8e5a10 100644 --- a/images/two-branches.svg +++ b/images/two-branches.svg @@ -10,31 +10,31 @@ - + master - + testing - + f30ab - + 34ac2 - + 98ca9 diff --git a/images/undomerge-reset.svg b/images/undomerge-reset.svg index 1cdb4a313..732021961 100644 --- a/images/undomerge-reset.svg +++ b/images/undomerge-reset.svg @@ -6,7 +6,7 @@ - + C1 @@ -15,7 +15,7 @@ - + C2 @@ -24,21 +24,21 @@ - + C5 - + C3 - + C4 @@ -46,7 +46,7 @@ - + C6 @@ -56,7 +56,7 @@ - + M @@ -66,7 +66,7 @@ - + master @@ -75,7 +75,7 @@ - + HEAD @@ -85,7 +85,7 @@ - + topic diff --git a/images/undomerge-revert.svg b/images/undomerge-revert.svg index 9e0916e8f..9b27a3f05 100644 --- a/images/undomerge-revert.svg +++ b/images/undomerge-revert.svg @@ -6,7 +6,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -25,21 +25,21 @@ - + C5 - + C3 - + C4 @@ -47,7 +47,7 @@ - + C6 @@ -56,7 +56,7 @@ - + M @@ -64,7 +64,7 @@ - + ^M @@ -73,7 +73,7 @@ - + master @@ -82,7 +82,7 @@ - + HEAD @@ -92,7 +92,7 @@ - + topic diff --git a/images/undomerge-revert2.svg b/images/undomerge-revert2.svg index 6c656744c..37c59247b 100644 --- a/images/undomerge-revert2.svg +++ b/images/undomerge-revert2.svg @@ -6,7 +6,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -25,21 +25,21 @@ - + C5 - + C3 - + C4 @@ -47,7 +47,7 @@ - + C6 @@ -55,7 +55,7 @@ - + C7 @@ -63,7 +63,7 @@ - + C8 @@ -71,7 +71,7 @@ - + M @@ -79,7 +79,7 @@ - + ^M @@ -88,7 +88,7 @@ - + master @@ -97,7 +97,7 @@ - + HEAD @@ -107,7 +107,7 @@ - + topic diff --git a/images/undomerge-revert3.svg b/images/undomerge-revert3.svg index df372279d..9f3ee2fa2 100644 --- a/images/undomerge-revert3.svg +++ b/images/undomerge-revert3.svg @@ -6,7 +6,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -25,21 +25,21 @@ - + C5 - + C3 - + C4 @@ -47,7 +47,7 @@ - + C6 @@ -55,7 +55,7 @@ - + C7 @@ -63,7 +63,7 @@ - + ^^M @@ -72,7 +72,7 @@ - + C8 @@ -80,7 +80,7 @@ - + M @@ -88,7 +88,7 @@ - + ^M @@ -97,7 +97,7 @@ - + master @@ -106,7 +106,7 @@ - + HEAD @@ -116,7 +116,7 @@ - + topic diff --git a/images/undomerge-start.svg b/images/undomerge-start.svg index 4eeed8cb4..893586c31 100644 --- a/images/undomerge-start.svg +++ b/images/undomerge-start.svg @@ -6,7 +6,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -25,21 +25,21 @@ - + C5 - + C3 - + C4 @@ -47,7 +47,7 @@ - + C6 @@ -55,7 +55,7 @@ - + M @@ -63,7 +63,7 @@ - + master @@ -72,7 +72,7 @@ - + HEAD @@ -81,7 +81,7 @@ - + topic From 4723c02ff0e37426f5a9cb2c883accb027c1f9fa Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 10 Aug 2019 18:12:47 +0200 Subject: [PATCH 03/23] files checked and corrected customized color scheme that better matches the former look --- images/advance-master.svg | 112 +++++++++---------- images/advance-testing.svg | 100 ++++++++--------- images/areas.svg | 85 ++++++++------- images/centralized.svg | 61 +++++------ images/deltas.svg | 176 +++++++++++------------------- images/distributed.svg | 214 +++++++++++++++++-------------------- images/local.svg | 90 ++++++++-------- 7 files changed, 362 insertions(+), 476 deletions(-) diff --git a/images/advance-master.svg b/images/advance-master.svg index 9e870b63b..f87f7e94f 100644 --- a/images/advance-master.svg +++ b/images/advance-master.svg @@ -1,63 +1,51 @@ - - - - images/advance-master - Created with Sketch. - - - - - - - - - f30ab - - - - - - 34ac2 - - - - - - 98ca9 - - - - - - 87ab2 - - - - - - c2b9e - - - - - - - testing - - - - - - - master - - - - - - - HEAD - - - + + + + + + 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.svg b/images/advance-testing.svg index 4c9280c91..5943a30f4 100644 --- a/images/advance-testing.svg +++ b/images/advance-testing.svg @@ -1,56 +1,46 @@ - - - - images/advance-testing - Created with Sketch. - - - - - - - - - master - - - - - - f30ab - - - - - - 87ab2 - - - - - - 34ac2 - - - - - - 98ca9 - - - - - - - testing - - - - - - - HEAD - - - + + + + + + image/svg+xml + + images/advance-testing + + + + images/advance-testing + Created with Sketch. + + + + + + + + master + + + + f30ab + + + + 87ab2 + + + + 34ac2 + + + + 98ca9 + + + + + testing + + + HEAD diff --git a/images/areas.svg b/images/areas.svg index 8d2a0b324..bf7e4ebff 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -1,44 +1,43 @@ - - - - images/areas - Created with Sketch. - - - - - - - - Working - Directory - - - - - - Staging - Area - - - - - - .git directory - (Repository) - - - - - - - Checkout the project - - - Stage Fixes - - - Commit - - + + + + + + image/svg+xml + + images/areas + + + + images/areas + Created with Sketch. + + + + + + + + + + Working Directory + + + + Staging Area + + .git directory (Repository) + + + + + + + + + Checkout the project + Stage Fixes + Commit + + diff --git a/images/centralized.svg b/images/centralized.svg index 6eb4aa3f8..2d2508759 100644 --- a/images/centralized.svg +++ b/images/centralized.svg @@ -1,38 +1,25 @@ - - - - images/centralized - Created with Sketch. - - - - - - shared - repository - - - - - - developer - - - - - - developer - - - - - - developer - - - - - - - + + + + + + image/svg+xml + + images/centralized + + + + images/centralized + Created with Sketch. + + shared repository + + developer + + developer + + developer + + + diff --git a/images/deltas.svg b/images/deltas.svg index 42c351846..292cc6f5b 100644 --- a/images/deltas.svg +++ b/images/deltas.svg @@ -1,117 +1,61 @@ - - - - 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 - - - + + + + + + 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.svg b/images/distributed.svg index 9faee1314..ba1eafacf 100644 --- a/images/distributed.svg +++ b/images/distributed.svg @@ -1,117 +1,99 @@ - - - - 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 - - - - - - - - + + + + + + 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/local.svg b/images/local.svg index 59d7a0958..21258de6a 100644 --- a/images/local.svg +++ b/images/local.svg @@ -1,48 +1,44 @@ - - - - images/local - Created with Sketch. - - - - - Local Computer - - - - Version Database - - - Checkout - - - - - File - - - - - - Version 3 - - - - - - Version 2 - - - - - - Version 1 - - - - - - - + + + + + + image/svg+xml + + images/local + + + + images/local + Created with Sketch. + + + + Local Computer + + Version Database + Checkout + + + File + + + + Version 3 + + + + Version 2 + + + + Version 1 + + + + + + + + From de069d4c1ef8a1b59754f8b9ef9864bedcda7bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Mon, 12 Aug 2019 21:59:21 +0200 Subject: [PATCH 04/23] fix strings colors --- images/advance-master.svg | 14 ++--- images/advance-testing.svg | 12 ++--- images/areas.svg | 12 +++-- images/basic-branching-1.svg | 8 +-- images/basic-branching-2.svg | 10 ++-- images/basic-branching-3.svg | 12 ++--- images/basic-branching-4.svg | 16 +++--- images/basic-branching-5.svg | 16 +++--- images/basic-branching-6.svg | 16 +++--- images/basic-merging-1.svg | 16 +++--- images/basic-merging-2.svg | 18 +++---- images/basic-rebase-1.svg | 14 ++--- images/basic-rebase-2.svg | 16 +++--- images/basic-rebase-3.svg | 16 +++--- images/basic-rebase-4.svg | 14 ++--- images/benevolent-dictator.svg | 22 ++++---- images/branch-and-history.svg | 18 +++---- images/centralized.svg | 4 +- images/checkout-master.svg | 14 ++--- images/clean.svg | 22 ++++---- images/commit-and-tree.svg | 82 +++++++++++++++--------------- images/commits-and-parents.svg | 82 +++++++++++++++--------------- images/data-model-1.svg | 18 +++---- images/data-model-2.svg | 28 +++++----- images/data-model-3.svg | 48 +++++++++--------- images/data-model-4.svg | 52 +++++++++---------- images/deltas.svg | 36 ++++++------- images/distributed.svg | 38 +++++++------- images/double-dot.svg | 16 +++--- images/head-to-master.svg | 12 ++--- images/head-to-testing.svg | 12 ++--- images/integration-manager.svg | 32 ++++++------ images/interesting-rebase-1.svg | 24 ++++----- images/interesting-rebase-2.svg | 28 +++++----- images/interesting-rebase-3.svg | 24 ++++----- images/interesting-rebase-4.svg | 30 +++++------ images/interesting-rebase-5.svg | 20 ++++---- images/large-merges-1.svg | 36 ++++++------- images/large-merges-2.svg | 50 +++++++++--------- images/lifecycle.svg | 8 +-- images/local.svg | 18 +++---- images/lr-branches-1.svg | 20 ++++---- images/lr-branches-2.svg | 14 ++--- images/managed-team-1.svg | 16 +++--- images/managed-team-2.svg | 32 ++++++------ images/managed-team-3.svg | 38 +++++++------- images/managed-team-flow.svg | 28 +++++----- images/merging-workflows-1.svg | 20 ++++---- images/merging-workflows-2.svg | 24 ++++----- images/merging-workflows-3.svg | 16 +++--- images/merging-workflows-4.svg | 18 +++---- images/merging-workflows-5.svg | 18 +++---- images/perils-of-rebasing-1.svg | 18 +++---- images/perils-of-rebasing-2.svg | 32 ++++++------ images/perils-of-rebasing-3.svg | 36 ++++++------- images/perils-of-rebasing-4.svg | 38 +++++++------- images/perils-of-rebasing-5.svg | 30 +++++------ images/public-small-1.svg | 22 ++++---- images/public-small-2.svg | 22 ++++---- images/public-small-3.svg | 26 +++++----- images/rebasing-1.svg | 14 ++--- images/rebasing-2.svg | 16 +++--- images/remote-branches-1.svg | 28 +++++----- images/remote-branches-2.svg | 30 +++++------ images/remote-branches-3.svg | 36 ++++++------- images/remote-branches-4.svg | 44 ++++++++-------- images/remote-branches-5.svg | 46 ++++++++--------- images/replace1.svg | 12 ++--- images/replace2.svg | 14 ++--- images/replace3.svg | 14 ++--- images/replace4.svg | 20 ++++---- images/replace5.svg | 36 ++++++------- images/rerere1.svg | 10 ++-- images/rerere2.svg | 20 ++++---- images/rerere3.svg | 24 ++++----- images/reset-checkout.svg | 30 +++++------ images/reset-ex1.svg | 20 ++++---- images/reset-ex2.svg | 26 +++++----- images/reset-ex3.svg | 36 ++++++------- images/reset-ex4.svg | 36 ++++++------- images/reset-ex5.svg | 36 ++++++------- images/reset-ex6.svg | 42 +++++++-------- images/reset-hard.svg | 54 ++++++++++---------- images/reset-mixed.svg | 52 +++++++++---------- images/reset-path1.svg | 36 ++++++------- images/reset-path2.svg | 36 ++++++------- images/reset-path3.svg | 48 +++++++++--------- images/reset-soft.svg | 48 +++++++++--------- images/reset-squash-r1.svg | 44 ++++++++-------- images/reset-squash-r2.svg | 44 ++++++++-------- images/reset-squash-r3.svg | 52 +++++++++---------- images/reset-start.svg | 46 ++++++++--------- images/reset-workflow.svg | 8 +-- images/small-team-1.svg | 12 ++--- images/small-team-2.svg | 14 ++--- images/small-team-3.svg | 14 ++--- images/small-team-4.svg | 18 +++---- images/small-team-5.svg | 22 ++++---- images/small-team-6.svg | 24 ++++----- images/small-team-7.svg | 24 ++++----- images/small-team-flow.svg | 12 ++--- images/smudge.svg | 22 ++++---- images/snapshots.svg | 32 ++++++------ images/symbols.svg | 90 ++++++++++++++++----------------- images/topic-branches-1.svg | 36 ++++++------- images/topic-branches-2.svg | 32 ++++++------ images/two-branches.svg | 10 ++-- images/undomerge-reset.svg | 20 ++++---- images/undomerge-revert.svg | 22 ++++---- images/undomerge-revert2.svg | 26 +++++----- images/undomerge-revert3.svg | 28 +++++----- images/undomerge-start.svg | 20 ++++---- 112 files changed, 1495 insertions(+), 1493 deletions(-) diff --git a/images/advance-master.svg b/images/advance-master.svg index f87f7e94f..746f6defd 100644 --- a/images/advance-master.svg +++ b/images/advance-master.svg @@ -1,5 +1,5 @@ - - + + @@ -20,23 +20,23 @@ - f30ab + f30ab - 34ac2 + 34ac2 - 98ca9 + 98ca9 - 87ab2 + 87ab2 - c2b9e + c2b9e diff --git a/images/advance-testing.svg b/images/advance-testing.svg index 5943a30f4..b666bc721 100644 --- a/images/advance-testing.svg +++ b/images/advance-testing.svg @@ -1,5 +1,5 @@ - - + + @@ -22,19 +22,19 @@ - f30ab + f30ab - 87ab2 + 87ab2 - 34ac2 + 34ac2 - 98ca9 + 98ca9 diff --git a/images/areas.svg b/images/areas.svg index bf7e4ebff..6088f1309 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -1,5 +1,5 @@ - - + + @@ -20,13 +20,15 @@ - Working Directory + Working Directory + + Staging Area + - Staging Area - .git directory (Repository) + .git directory (Repository) diff --git a/images/basic-branching-1.svg b/images/basic-branching-1.svg index e361c76eb..68ddb061e 100644 --- a/images/basic-branching-1.svg +++ b/images/basic-branching-1.svg @@ -7,7 +7,7 @@ - C0 + C0 @@ -16,19 +16,19 @@ - C1 + C1 - C2 + C2 - master + master diff --git a/images/basic-branching-2.svg b/images/basic-branching-2.svg index 94059fbc5..dc9e97fd9 100644 --- a/images/basic-branching-2.svg +++ b/images/basic-branching-2.svg @@ -7,7 +7,7 @@ - C0 + C0 @@ -17,25 +17,25 @@ - C1 + C1 - C2 + C2 - master + master - iss53 + iss53 diff --git a/images/basic-branching-3.svg b/images/basic-branching-3.svg index cc414b6d2..4d3160425 100644 --- a/images/basic-branching-3.svg +++ b/images/basic-branching-3.svg @@ -8,25 +8,25 @@ - C0 + C0 - C1 + C1 - C2 + C2 - C3 + C3 @@ -35,7 +35,7 @@ - master + master @@ -43,7 +43,7 @@ - iss53 + iss53 diff --git a/images/basic-branching-4.svg b/images/basic-branching-4.svg index a84e5890b..8ea190f90 100644 --- a/images/basic-branching-4.svg +++ b/images/basic-branching-4.svg @@ -10,26 +10,26 @@ - C0 + C0 - C1 + C1 - C2 + C2 - master + master @@ -38,21 +38,21 @@ - hotfix + hotfix - C4 + C4 - C3 + C3 @@ -60,7 +60,7 @@ - iss53 + iss53 diff --git a/images/basic-branching-5.svg b/images/basic-branching-5.svg index b23e8866f..a93502218 100644 --- a/images/basic-branching-5.svg +++ b/images/basic-branching-5.svg @@ -10,26 +10,26 @@ - C0 + C0 - C1 + C1 - C2 + C2 - master + master @@ -38,21 +38,21 @@ - hotfix + hotfix - C4 + C4 - C3 + C3 @@ -60,7 +60,7 @@ - iss53 + iss53 diff --git a/images/basic-branching-6.svg b/images/basic-branching-6.svg index 3c9c9b31b..61a4dc5d1 100644 --- a/images/basic-branching-6.svg +++ b/images/basic-branching-6.svg @@ -10,19 +10,19 @@ - C0 + C0 - C1 + C1 - C2 + C2 @@ -31,14 +31,14 @@ - master + master - C4 + C4 @@ -46,14 +46,14 @@ - C5 + C5 - C3 + C3 @@ -61,7 +61,7 @@ - iss53 + iss53 diff --git a/images/basic-merging-1.svg b/images/basic-merging-1.svg index 0b7784ad1..13bb20663 100644 --- a/images/basic-merging-1.svg +++ b/images/basic-merging-1.svg @@ -10,19 +10,19 @@ - C0 + C0 - C1 + C1 - C2 + C2 @@ -31,27 +31,27 @@ - master + master - C4 + C4 - C5 + C5 - C3 + C3 @@ -59,7 +59,7 @@ - iss53 + iss53 diff --git a/images/basic-merging-2.svg b/images/basic-merging-2.svg index 3105f00a3..ea7ffbb90 100644 --- a/images/basic-merging-2.svg +++ b/images/basic-merging-2.svg @@ -10,19 +10,19 @@ - C0 + C0 - C1 + C1 - C2 + C2 @@ -31,14 +31,14 @@ - master + master - C4 + C4 @@ -46,7 +46,7 @@ - C5 + C5 @@ -55,13 +55,13 @@ - C6 + C6 - C3 + C3 @@ -69,7 +69,7 @@ - iss53 + iss53 diff --git a/images/basic-rebase-1.svg b/images/basic-rebase-1.svg index 6a1551f00..133fce1e4 100644 --- a/images/basic-rebase-1.svg +++ b/images/basic-rebase-1.svg @@ -10,19 +10,19 @@ - C0 + C0 - C1 + C1 - C2 + C2 @@ -31,7 +31,7 @@ - experiment + experiment @@ -39,13 +39,13 @@ - C4 + C4 - C3 + C3 @@ -54,7 +54,7 @@ - master + master diff --git a/images/basic-rebase-2.svg b/images/basic-rebase-2.svg index e089aa413..58db7d6ee 100644 --- a/images/basic-rebase-2.svg +++ b/images/basic-rebase-2.svg @@ -9,19 +9,19 @@ - C0 + C0 - C1 + C1 - C2 + C2 @@ -31,14 +31,14 @@ - experiment + experiment - C4 + C4 @@ -46,7 +46,7 @@ - C3 + C3 @@ -54,7 +54,7 @@ - C5 + C5 @@ -62,7 +62,7 @@ - master + master diff --git a/images/basic-rebase-3.svg b/images/basic-rebase-3.svg index 328040a40..0201534e7 100644 --- a/images/basic-rebase-3.svg +++ b/images/basic-rebase-3.svg @@ -9,19 +9,19 @@ - C0 + C0 - C1 + C1 - C2 + C2 @@ -29,7 +29,7 @@ - experiment + experiment @@ -38,7 +38,7 @@ - C4 + C4 @@ -47,7 +47,7 @@ - C3 + C3 @@ -55,7 +55,7 @@ - C4' + C4' @@ -63,7 +63,7 @@ - master + master diff --git a/images/basic-rebase-4.svg b/images/basic-rebase-4.svg index 8bdd1a44e..6aba25d9e 100644 --- a/images/basic-rebase-4.svg +++ b/images/basic-rebase-4.svg @@ -9,19 +9,19 @@ - C0 + C0 - C1 + C1 - C2 + C2 @@ -29,7 +29,7 @@ - experiment + experiment @@ -38,7 +38,7 @@ - C3 + C3 @@ -46,7 +46,7 @@ - C4' + C4' @@ -54,7 +54,7 @@ - master + master diff --git a/images/benevolent-dictator.svg b/images/benevolent-dictator.svg index fb53fa717..adb7d0f0a 100644 --- a/images/benevolent-dictator.svg +++ b/images/benevolent-dictator.svg @@ -8,41 +8,41 @@ - blessed - repository + blessed + repository - lieutenant + lieutenant - lieutenant + lieutenant - developer - public + developer + public - developer - public + developer + public - developer - public + developer + public @@ -59,7 +59,7 @@ - dictator + dictator diff --git a/images/branch-and-history.svg b/images/branch-and-history.svg index f6929267f..0cb32c950 100644 --- a/images/branch-and-history.svg +++ b/images/branch-and-history.svg @@ -8,27 +8,27 @@ - Snapshot C + Snapshot C - Snapshot B + Snapshot B - Snapshot A + Snapshot A - f30ab + f30ab @@ -37,13 +37,13 @@ - 34ac2 + 34ac2 - 98ca9 + 98ca9 @@ -51,19 +51,19 @@ - master + master - HEAD + HEAD - v1.0 + v1.0 diff --git a/images/centralized.svg b/images/centralized.svg index 2d2508759..ec055ce69 100644 --- a/images/centralized.svg +++ b/images/centralized.svg @@ -1,5 +1,5 @@ - - + + diff --git a/images/checkout-master.svg b/images/checkout-master.svg index 568209e34..b523eba70 100644 --- a/images/checkout-master.svg +++ b/images/checkout-master.svg @@ -11,38 +11,38 @@ - master + master - f30ab + f30ab - 87ab2 + 87ab2 - 34ac2 + 34ac2 - 98ca9 + 98ca9 - testing + testing @@ -50,7 +50,7 @@ - HEAD + HEAD diff --git a/images/clean.svg b/images/clean.svg index a292e4c64..039fbbcc6 100644 --- a/images/clean.svg +++ b/images/clean.svg @@ -8,59 +8,59 @@ - fileA.txt + fileA.txt - fileA.txt' + fileA.txt' - fileB.txt' + fileB.txt' - fileB.txt + fileB.txt - fileC.rb + fileC.rb - fileC.rb + fileC.rb - Staging Area + Staging Area - Working Directory + Working Directory - *.txt Filter + *.txt Filter - smudge + smudge - clean + clean diff --git a/images/commit-and-tree.svg b/images/commit-and-tree.svg index 56d86057b..0544273c7 100644 --- a/images/commit-and-tree.svg +++ b/images/commit-and-tree.svg @@ -7,85 +7,85 @@ - size - 92ec2 - Scott - Scott + size + 92ec2 + Scott + Scott - commit - - tree - author - committer + commit + + tree + author + committer - The initial commit of my project + The initial commit of my project - size - 5b1d3 README - 911e7 LICENSE - cba0a test.rb + size + 5b1d3 README + 911e7 LICENSE + cba0a test.rb - tree - - blob - blob - blob + tree + + blob + blob + blob - size + size - blob + blob - == Testing library - - This library is used to test - Ruby projects. + == Testing library + + This library is used to test + Ruby projects. - size + size - blob + blob - The MIT License - - Copyright (c) 2008 Scott Chacon - - Permission is hereby granted, - free of charge, to any person + The MIT License + + Copyright (c) 2008 Scott Chacon + + Permission is hereby granted, + free of charge, to any person - size + size - blob + blob - require 'logger' - require 'test/unit' - - - class Test::Unit::TestCase - + require 'logger' + require 'test/unit' + + + class Test::Unit::TestCase + diff --git a/images/commits-and-parents.svg b/images/commits-and-parents.svg index c5fa31dfd..e14ba05f2 100644 --- a/images/commits-and-parents.svg +++ b/images/commits-and-parents.svg @@ -7,57 +7,57 @@ - size - 92ec2 - - Scott - Scott + size + 92ec2 + + Scott + Scott - commit - - tree - parent - author - committer + commit + + tree + parent + author + committer - The initial commit of my project + The initial commit of my project - Snapshot A + Snapshot A - size - 184ca - 98ca9 - Scott - Scott + size + 184ca + 98ca9 + Scott + Scott - commit - - tree - parent - author - committer + commit + + tree + parent + author + committer - Fixed bug #1328 - stack overflow - under certain conditions + Fixed bug #1328 - stack overflow + under certain conditions - Snapshot B + Snapshot B @@ -71,29 +71,29 @@ - size - 0de24 - 34ac2 - Scott - Scott + size + 0de24 + 34ac2 + Scott + Scott - commit - - tree - parent - author - committer + commit + + tree + parent + author + committer - add feature #32 - ability to add new - formats to the central interface + add feature #32 - ability to add new + formats to the central interface - Snapshot C + Snapshot C diff --git a/images/data-model-1.svg b/images/data-model-1.svg index ef4452c40..804f1a39c 100644 --- a/images/data-model-1.svg +++ b/images/data-model-1.svg @@ -7,19 +7,19 @@ - blob + blob - blob + blob - blob + blob @@ -29,37 +29,37 @@ - simplegit.rb + simplegit.rb - Rakefile + Rakefile - README + README - lib + lib - tree + tree - tree + tree diff --git a/images/data-model-2.svg b/images/data-model-2.svg index 9b751cc18..5945a52a2 100644 --- a/images/data-model-2.svg +++ b/images/data-model-2.svg @@ -7,28 +7,28 @@ - "version 2" + "version 2" - 1f7a7a + 1f7a7a - "new file" + "new file" - fa49b0 + fa49b0 - "version 1" + "version 1" - 83baae + 83baae @@ -38,43 +38,43 @@ - test.txt + test.txt - test.txt + test.txt - new.txt + new.txt - bak + bak - tree + tree - 3c4e9c + 3c4e9c - tree + tree - d8329f + d8329f diff --git a/images/data-model-3.svg b/images/data-model-3.svg index 8ffcce222..f28bb7931 100644 --- a/images/data-model-3.svg +++ b/images/data-model-3.svg @@ -16,120 +16,120 @@ - "version 2" + "version 2" - 1f7a7a + 1f7a7a - "new file" + "new file" - fa49b0 + fa49b0 - "version 1" + "version 1" - 83baae + 83baae - test.txt + test.txt - test.txt + test.txt - test.txt + test.txt - new.txt + new.txt - new.txt + new.txt - bak + bak - tree + tree - 3c4e9c + 3c4e9c - third commit + third commit - 1a410e + 1a410e - second commit + second commit - cac0ca + cac0ca - first commit + first commit - fdf4fc + fdf4fc - tree + tree - 0155eb + 0155eb - tree + tree - d8329f + d8329f diff --git a/images/data-model-4.svg b/images/data-model-4.svg index 3d07f1cec..22733b8b7 100644 --- a/images/data-model-4.svg +++ b/images/data-model-4.svg @@ -16,102 +16,102 @@ - "version 2" + "version 2" - 1f7a7a + 1f7a7a - "new file" + "new file" - fa49b0 + fa49b0 - "version 1" + "version 1" - 83baae + 83baae - test.txt + test.txt - test.txt + test.txt - test.txt + test.txt - new.txt + new.txt - new.txt + new.txt - bak + bak - tree + tree - 3c4e9c + 3c4e9c - third commit + third commit - 1a410e + 1a410e - second commit + second commit - cac0ca + cac0ca - first commit + first commit - fdf4fc + fdf4fc @@ -119,7 +119,7 @@ - refs/heads/test + refs/heads/test @@ -128,26 +128,26 @@ - refs/heads/master + refs/heads/master - tree + tree - 0155eb + 0155eb - tree + tree - d8329f + d8329f diff --git a/images/deltas.svg b/images/deltas.svg index 292cc6f5b..bf4b46013 100644 --- a/images/deltas.svg +++ b/images/deltas.svg @@ -1,5 +1,5 @@ - - + + @@ -13,39 +13,39 @@ Created with Sketch. - Version 1 + Version 1 - Version 2 + Version 2 - Version 3 + Version 3 - Version 4 + Version 4 - Version 5 + Version 5 - File A + File A - File A + File A - Δ1 + Δ1 - Δ1 + Δ1 - Δ2 + Δ2 - Δ1 + Δ1 - Δ2 + Δ2 - Δ2 + Δ2 - Δ3 + Δ3 - File B + File B - File C + File C diff --git a/images/distributed.svg b/images/distributed.svg index ba1eafacf..cb75dce5d 100644 --- a/images/distributed.svg +++ b/images/distributed.svg @@ -1,5 +1,5 @@ - - + + @@ -14,81 +14,81 @@ - Version Database + Version Database - Version 3 + Version 3 - Version 2 + Version 2 - Version 1 + Version 1 - Server Computer + Server Computer - Version Database + Version Database - Version 3 + Version 3 - Version 2 + Version 2 - Version 1 + Version 1 - Computer A + Computer A - File + File - Version Database + Version Database - Version 3 + Version 3 - Version 2 + Version 2 - Version 1 + Version 1 - Computer B + Computer B - File + File diff --git a/images/double-dot.svg b/images/double-dot.svg index cb98153ce..aba13123f 100644 --- a/images/double-dot.svg +++ b/images/double-dot.svg @@ -7,7 +7,7 @@ - A + A @@ -15,7 +15,7 @@ - B + B @@ -24,7 +24,7 @@ - E + E @@ -34,7 +34,7 @@ - F + F @@ -43,7 +43,7 @@ - C + C @@ -52,7 +52,7 @@ - D + D @@ -61,7 +61,7 @@ - master + master @@ -70,7 +70,7 @@ - experiment + experiment diff --git a/images/head-to-master.svg b/images/head-to-master.svg index 4304d05bc..d27019890 100644 --- a/images/head-to-master.svg +++ b/images/head-to-master.svg @@ -12,37 +12,37 @@ - master + master - testing + testing - f30ab + f30ab - 34ac2 + 34ac2 - 98ca9 + 98ca9 - HEAD + HEAD diff --git a/images/head-to-testing.svg b/images/head-to-testing.svg index 05bdac56e..07b06aa49 100644 --- a/images/head-to-testing.svg +++ b/images/head-to-testing.svg @@ -11,38 +11,38 @@ - master + master - testing + testing - f30ab + f30ab - 34ac2 + 34ac2 - 98ca9 + 98ca9 - HEAD + HEAD diff --git a/images/integration-manager.svg b/images/integration-manager.svg index 08b161451..87b65cc37 100644 --- a/images/integration-manager.svg +++ b/images/integration-manager.svg @@ -8,44 +8,44 @@ - blessed - repository + blessed + repository - integration - manager + integration + manager - developer - public + developer + public - developer - private + developer + private - developer - public + developer + public - developer - private + developer + private @@ -59,15 +59,15 @@ - developer - public + developer + public - developer - private + developer + private diff --git a/images/interesting-rebase-1.svg b/images/interesting-rebase-1.svg index cc9d12f3c..34f4d52ec 100644 --- a/images/interesting-rebase-1.svg +++ b/images/interesting-rebase-1.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -15,7 +15,7 @@ - C2 + C2 @@ -24,7 +24,7 @@ - C5 + C5 @@ -33,7 +33,7 @@ - master + master @@ -42,7 +42,7 @@ - C6 + C6 @@ -50,7 +50,7 @@ - C3 + C3 @@ -58,7 +58,7 @@ - C4 + C4 @@ -66,21 +66,21 @@ - C8 + C8 - C9 + C9 - C10 + C10 @@ -88,7 +88,7 @@ - server + server @@ -97,7 +97,7 @@ - client + client diff --git a/images/interesting-rebase-2.svg b/images/interesting-rebase-2.svg index 35caf5b83..ebaa39fa3 100644 --- a/images/interesting-rebase-2.svg +++ b/images/interesting-rebase-2.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -15,7 +15,7 @@ - C2 + C2 @@ -24,7 +24,7 @@ - C5 + C5 @@ -33,7 +33,7 @@ - master + master @@ -42,7 +42,7 @@ - C6 + C6 @@ -51,7 +51,7 @@ - C8' + C8' @@ -59,14 +59,14 @@ - C9' + C9' - C3 + C3 @@ -74,7 +74,7 @@ - C4 + C4 @@ -83,14 +83,14 @@ - C8 + C8 - C9 + C9 @@ -98,7 +98,7 @@ - C10 + C10 @@ -106,7 +106,7 @@ - server + server @@ -115,7 +115,7 @@ - client + client diff --git a/images/interesting-rebase-3.svg b/images/interesting-rebase-3.svg index c0ceda4ab..21e757ace 100644 --- a/images/interesting-rebase-3.svg +++ b/images/interesting-rebase-3.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -15,7 +15,7 @@ - C2 + C2 @@ -24,7 +24,7 @@ - C5 + C5 @@ -33,7 +33,7 @@ - master + master @@ -42,7 +42,7 @@ - C6 + C6 @@ -51,7 +51,7 @@ - C8' + C8' @@ -59,14 +59,14 @@ - C9' + C9' - C3 + C3 @@ -74,7 +74,7 @@ - C4 + C4 @@ -82,7 +82,7 @@ - C10 + C10 @@ -90,7 +90,7 @@ - server + server @@ -99,7 +99,7 @@ - client + client diff --git a/images/interesting-rebase-4.svg b/images/interesting-rebase-4.svg index a7c979a25..e01c1d789 100644 --- a/images/interesting-rebase-4.svg +++ b/images/interesting-rebase-4.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -15,7 +15,7 @@ - C2 + C2 @@ -24,7 +24,7 @@ - C5 + C5 @@ -33,7 +33,7 @@ - master + master @@ -42,7 +42,7 @@ - C6 + C6 @@ -51,7 +51,7 @@ - C8' + C8' @@ -59,7 +59,7 @@ - C9' + C9' @@ -67,7 +67,7 @@ - C3' + C3' @@ -76,7 +76,7 @@ - C4' + C4' @@ -84,7 +84,7 @@ - C10' + C10' @@ -92,7 +92,7 @@ - C3 + C3 @@ -100,7 +100,7 @@ - C4 + C4 @@ -108,7 +108,7 @@ - C10 + C10 @@ -117,7 +117,7 @@ - server + server @@ -126,7 +126,7 @@ - client + client diff --git a/images/interesting-rebase-5.svg b/images/interesting-rebase-5.svg index 99f913cb7..a3cf3e855 100644 --- a/images/interesting-rebase-5.svg +++ b/images/interesting-rebase-5.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -15,7 +15,7 @@ - C2 + C2 @@ -24,7 +24,7 @@ - C5 + C5 @@ -33,7 +33,7 @@ - master + master @@ -42,7 +42,7 @@ - C6 + C6 @@ -51,7 +51,7 @@ - C8' + C8' @@ -59,7 +59,7 @@ - C9' + C9' @@ -67,7 +67,7 @@ - C3' + C3' @@ -76,7 +76,7 @@ - C4' + C4' @@ -84,7 +84,7 @@ - C10' + C10' diff --git a/images/large-merges-1.svg b/images/large-merges-1.svg index d7b06d6ad..575869acd 100644 --- a/images/large-merges-1.svg +++ b/images/large-merges-1.svg @@ -9,7 +9,7 @@ - master + master @@ -18,7 +18,7 @@ - tv/rebase-stat + tv/rebase-stat @@ -27,7 +27,7 @@ - jk/clone-checkout + jk/clone-checkout @@ -36,7 +36,7 @@ - db/push-cleanup + db/push-cleanup @@ -45,7 +45,7 @@ - js/notes + js/notes @@ -54,21 +54,21 @@ - ps/blame + ps/blame - C1 + C1 - C2 + C2 @@ -79,31 +79,31 @@ - C3 + C3 - C5 + C5 - C7 + C7 - C9 + C9 - C11 + C11 @@ -111,7 +111,7 @@ - C4 + C4 @@ -120,7 +120,7 @@ - C6 + C6 @@ -129,7 +129,7 @@ - C8 + C8 @@ -138,7 +138,7 @@ - C10 + C10 @@ -147,7 +147,7 @@ - C12 + C12 diff --git a/images/large-merges-2.svg b/images/large-merges-2.svg index fb8b4c443..ffb14a608 100644 --- a/images/large-merges-2.svg +++ b/images/large-merges-2.svg @@ -9,7 +9,7 @@ - master + master @@ -18,7 +18,7 @@ - tv/rebase-stat + tv/rebase-stat @@ -27,7 +27,7 @@ - jk/clone-checkout + jk/clone-checkout @@ -36,7 +36,7 @@ - db/push-cleanup + db/push-cleanup @@ -45,7 +45,7 @@ - js/notes + js/notes @@ -54,7 +54,7 @@ - pu + pu @@ -63,7 +63,7 @@ - next + next @@ -72,21 +72,21 @@ - ps/blame + ps/blame - C1 + C1 - C2 + C2 @@ -101,31 +101,31 @@ - C3 + C3 - C5 + C5 - C7 + C7 - C9 + C9 - C11 + C11 @@ -133,7 +133,7 @@ - C4 + C4 @@ -141,35 +141,35 @@ - C16 + C16 - C17 + C17 - C13 + C13 - C14 + C14 - C15 + C15 @@ -177,7 +177,7 @@ - C6 + C6 @@ -186,7 +186,7 @@ - C8 + C8 @@ -195,7 +195,7 @@ - C10 + C10 @@ -204,7 +204,7 @@ - C12 + C12 diff --git a/images/lifecycle.svg b/images/lifecycle.svg index 10e44c9f8..8b85bd90d 100644 --- a/images/lifecycle.svg +++ b/images/lifecycle.svg @@ -14,7 +14,7 @@ - Modified + Modified @@ -37,13 +37,13 @@ - Untracked + Untracked - Unmodified + Unmodified @@ -52,7 +52,7 @@ - Staged + Staged diff --git a/images/local.svg b/images/local.svg index 21258de6a..17dfe71fb 100644 --- a/images/local.svg +++ b/images/local.svg @@ -1,5 +1,5 @@ - - + + @@ -14,25 +14,25 @@ - Local Computer + Local Computer - Version Database - Checkout + Version Database + Checkout - File + File - Version 3 + Version 3 - Version 2 + Version 2 - Version 1 + Version 1 diff --git a/images/lr-branches-1.svg b/images/lr-branches-1.svg index 68b9604a6..03fe6048b 100644 --- a/images/lr-branches-1.svg +++ b/images/lr-branches-1.svg @@ -7,70 +7,70 @@ - C1 + C1 - C2 + C2 - C3 + C3 - C4 + C4 - C5 + C5 - C6 + C6 - C7 + C7 - master + master - develop + develop - topic + topic diff --git a/images/lr-branches-2.svg b/images/lr-branches-2.svg index 5f3b4c8eb..6ad634bf4 100644 --- a/images/lr-branches-2.svg +++ b/images/lr-branches-2.svg @@ -15,7 +15,7 @@ - C1 + C1 @@ -23,41 +23,41 @@ - C2 + C2 - C3 + C3 - C4 + C4 - C5 + C5 - C6 + C6 - C7 + C7 diff --git a/images/managed-team-1.svg b/images/managed-team-1.svg index 6e47fe556..81439e85e 100644 --- a/images/managed-team-1.svg +++ b/images/managed-team-1.svg @@ -7,14 +7,14 @@ - 4b078 + 4b078 - 1edee + 1edee @@ -22,7 +22,7 @@ - 33009 + 33009 @@ -30,14 +30,14 @@ - 85127 + 85127 - e5b0f + e5b0f @@ -45,7 +45,7 @@ - featureB + featureB @@ -54,7 +54,7 @@ - master + master @@ -63,7 +63,7 @@ - featureA + featureA diff --git a/images/managed-team-2.svg b/images/managed-team-2.svg index b3582daa6..a2ceb0840 100644 --- a/images/managed-team-2.svg +++ b/images/managed-team-2.svg @@ -8,14 +8,14 @@ - 4b078 + 4b078 - 1edee + 1edee @@ -23,7 +23,7 @@ - 33009 + 33009 @@ -32,7 +32,7 @@ - aad88 + aad88 @@ -41,7 +41,7 @@ - 774b3 + 774b3 @@ -50,7 +50,7 @@ - 85127 + 85127 @@ -58,21 +58,21 @@ - cd685 + cd685 - fba9a + fba9a - e5b0f + e5b0f @@ -82,8 +82,8 @@ - origin/ - featureBee + origin/ + featureBee @@ -92,7 +92,7 @@ - featureB + featureB @@ -101,7 +101,7 @@ - master + master @@ -112,8 +112,8 @@ - origin/ - featureA + origin/ + featureA @@ -122,7 +122,7 @@ - featureA + featureA diff --git a/images/managed-team-3.svg b/images/managed-team-3.svg index 61ba47ed3..4a901b349 100644 --- a/images/managed-team-3.svg +++ b/images/managed-team-3.svg @@ -9,14 +9,14 @@ - 4b078 + 4b078 - 1edee + 1edee @@ -24,7 +24,7 @@ - 33009 + 33009 @@ -33,7 +33,7 @@ - aad88 + aad88 @@ -42,7 +42,7 @@ - 774b3 + 774b3 @@ -50,7 +50,7 @@ - 5399e + 5399e @@ -58,7 +58,7 @@ - 85127 + 85127 @@ -66,21 +66,21 @@ - cd685 + cd685 - fba9a + fba9a - e5b0f + e5b0f @@ -90,8 +90,8 @@ - origin/ - featureBee + origin/ + featureBee @@ -100,7 +100,7 @@ - featureB + featureB @@ -109,7 +109,7 @@ - master + master @@ -120,8 +120,8 @@ - origin/ - featureA + origin/ + featureA @@ -132,8 +132,8 @@ - origin/ - master + origin/ + master @@ -142,7 +142,7 @@ - featureA + featureA diff --git a/images/managed-team-flow.svg b/images/managed-team-flow.svg index ef5f6c398..fdbbcc334 100644 --- a/images/managed-team-flow.svg +++ b/images/managed-team-flow.svg @@ -7,70 +7,70 @@ - Josie + Josie - Josie + Josie - John + John - John + John - Jessica + Jessica - Jessica + Jessica - server: - featureA + server: + featureA - server: - featureA + server: + featureA - server: - featureBee + server: + featureBee - server: - featureBee + server: + featureBee diff --git a/images/merging-workflows-1.svg b/images/merging-workflows-1.svg index 22852505d..1c6300c8e 100644 --- a/images/merging-workflows-1.svg +++ b/images/merging-workflows-1.svg @@ -8,7 +8,7 @@ - C1 + C1 @@ -17,7 +17,7 @@ - C2 + C2 @@ -25,7 +25,7 @@ - C7 + C7 @@ -33,7 +33,7 @@ - C3 + C3 @@ -42,7 +42,7 @@ - C4 + C4 @@ -51,7 +51,7 @@ - C5 + C5 @@ -60,7 +60,7 @@ - C6 + C6 @@ -69,7 +69,7 @@ - master + master @@ -78,7 +78,7 @@ - ruby_client + ruby_client @@ -87,7 +87,7 @@ - php_client + php_client diff --git a/images/merging-workflows-2.svg b/images/merging-workflows-2.svg index dfc71b993..db7faf9e8 100644 --- a/images/merging-workflows-2.svg +++ b/images/merging-workflows-2.svg @@ -8,7 +8,7 @@ - C1 + C1 @@ -17,7 +17,7 @@ - C2 + C2 @@ -25,7 +25,7 @@ - C7 + C7 @@ -33,7 +33,7 @@ - C3 + C3 @@ -42,7 +42,7 @@ - C4 + C4 @@ -51,7 +51,7 @@ - C9 + C9 @@ -60,7 +60,7 @@ - C8 + C8 @@ -69,7 +69,7 @@ - C5 + C5 @@ -77,7 +77,7 @@ - C6 + C6 @@ -85,7 +85,7 @@ - master + master @@ -94,7 +94,7 @@ - ruby_client + ruby_client @@ -103,7 +103,7 @@ - php_client + php_client diff --git a/images/merging-workflows-3.svg b/images/merging-workflows-3.svg index 7d0fa5a4c..0dd1c58b8 100644 --- a/images/merging-workflows-3.svg +++ b/images/merging-workflows-3.svg @@ -8,7 +8,7 @@ - C1 + C1 @@ -16,14 +16,14 @@ - C2 + C2 - C5 + C5 @@ -31,7 +31,7 @@ - C3 + C3 @@ -39,7 +39,7 @@ - C4 + C4 @@ -47,7 +47,7 @@ - develop + develop @@ -56,7 +56,7 @@ - master + master @@ -65,7 +65,7 @@ - ruby_client + ruby_client diff --git a/images/merging-workflows-4.svg b/images/merging-workflows-4.svg index 72bc895f2..833201257 100644 --- a/images/merging-workflows-4.svg +++ b/images/merging-workflows-4.svg @@ -8,7 +8,7 @@ - C1 + C1 @@ -16,14 +16,14 @@ - C2 + C2 - C5 + C5 @@ -31,7 +31,7 @@ - C3 + C3 @@ -40,7 +40,7 @@ - C4 + C4 @@ -49,7 +49,7 @@ - C6 + C6 @@ -57,7 +57,7 @@ - develop + develop @@ -66,7 +66,7 @@ - master + master @@ -75,7 +75,7 @@ - ruby_client + ruby_client diff --git a/images/merging-workflows-5.svg b/images/merging-workflows-5.svg index 1d59404a4..62b47dd86 100644 --- a/images/merging-workflows-5.svg +++ b/images/merging-workflows-5.svg @@ -8,7 +8,7 @@ - C1 + C1 @@ -16,14 +16,14 @@ - C2 + C2 - C5 + C5 @@ -31,7 +31,7 @@ - C3 + C3 @@ -40,7 +40,7 @@ - C4 + C4 @@ -49,7 +49,7 @@ - C6 + C6 @@ -57,7 +57,7 @@ - develop + develop @@ -66,7 +66,7 @@ - master + master @@ -75,7 +75,7 @@ - ruby_client + ruby_client diff --git a/images/perils-of-rebasing-1.svg b/images/perils-of-rebasing-1.svg index 05a47ba8d..2afa0bef3 100644 --- a/images/perils-of-rebasing-1.svg +++ b/images/perils-of-rebasing-1.svg @@ -9,34 +9,34 @@ - C1 + C1 - master + master - C1 + C1 - C2 + C2 - C3 + C3 @@ -44,7 +44,7 @@ - master + master @@ -53,15 +53,15 @@ - teamone/master + teamone/master - My Computer + My Computer - git.team1.ourcompany.com + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-2.svg b/images/perils-of-rebasing-2.svg index ac0b8934d..bf2d826ca 100644 --- a/images/perils-of-rebasing-2.svg +++ b/images/perils-of-rebasing-2.svg @@ -10,7 +10,7 @@ - C1 + C1 @@ -18,21 +18,21 @@ - master + master - C1 + C1 - C2 + C2 @@ -40,7 +40,7 @@ - C3 + C3 @@ -49,7 +49,7 @@ - C7 + C7 @@ -58,7 +58,7 @@ - C4 + C4 @@ -67,7 +67,7 @@ - C5 + C5 @@ -75,7 +75,7 @@ - C6 + C6 @@ -84,7 +84,7 @@ - C4 + C4 @@ -93,7 +93,7 @@ - C5 + C5 @@ -101,7 +101,7 @@ - C6 + C6 @@ -110,7 +110,7 @@ - master + master @@ -119,15 +119,15 @@ - teamone/master + teamone/master - My Computer + My Computer - git.team1.ourcompany.com + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-3.svg b/images/perils-of-rebasing-3.svg index cea3ed200..44f37d8df 100644 --- a/images/perils-of-rebasing-3.svg +++ b/images/perils-of-rebasing-3.svg @@ -10,7 +10,7 @@ - C1 + C1 @@ -18,21 +18,21 @@ - master + master - C1 + C1 - C2 + C2 @@ -40,7 +40,7 @@ - C3 + C3 @@ -49,7 +49,7 @@ - C7 + C7 @@ -58,7 +58,7 @@ - C4' + C4' @@ -67,7 +67,7 @@ - C4' + C4' @@ -75,7 +75,7 @@ - C5 + C5 @@ -84,7 +84,7 @@ - C4 + C4 @@ -94,7 +94,7 @@ - C6 + C6 @@ -104,7 +104,7 @@ - C4 + C4 @@ -113,7 +113,7 @@ - C5 + C5 @@ -121,7 +121,7 @@ - C6 + C6 @@ -130,7 +130,7 @@ - master + master @@ -139,15 +139,15 @@ - teamone/master + teamone/master - My Computer + My Computer - git.team1.ourcompany.com + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-4.svg b/images/perils-of-rebasing-4.svg index 70aa7d11b..de25a2975 100644 --- a/images/perils-of-rebasing-4.svg +++ b/images/perils-of-rebasing-4.svg @@ -11,7 +11,7 @@ - C1 + C1 @@ -19,21 +19,21 @@ - master + master - C1 + C1 - C2 + C2 @@ -41,7 +41,7 @@ - C3 + C3 @@ -50,7 +50,7 @@ - C7 + C7 @@ -59,7 +59,7 @@ - C8 + C8 @@ -68,7 +68,7 @@ - C4' + C4' @@ -77,7 +77,7 @@ - C4' + C4' @@ -85,7 +85,7 @@ - C5 + C5 @@ -94,7 +94,7 @@ - C4 + C4 @@ -104,7 +104,7 @@ - C6 + C6 @@ -114,7 +114,7 @@ - C4 + C4 @@ -123,7 +123,7 @@ - C5 + C5 @@ -131,7 +131,7 @@ - C6 + C6 @@ -140,7 +140,7 @@ - master + master @@ -149,15 +149,15 @@ - teamone/master + teamone/master - My Computer + My Computer - git.team1.ourcompany.com + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-5.svg b/images/perils-of-rebasing-5.svg index 058849b53..b224ad089 100644 --- a/images/perils-of-rebasing-5.svg +++ b/images/perils-of-rebasing-5.svg @@ -9,7 +9,7 @@ - C1 + C1 @@ -17,14 +17,14 @@ - master + master - C1 + C1 @@ -32,7 +32,7 @@ - C4' + C4' @@ -41,21 +41,21 @@ - C4' + C4' - C2' + C2' - C3' + C3' @@ -63,7 +63,7 @@ - C5 + C5 @@ -72,7 +72,7 @@ - C4 + C4 @@ -82,7 +82,7 @@ - C6 + C6 @@ -91,7 +91,7 @@ - C5 + C5 @@ -99,7 +99,7 @@ - master + master @@ -108,15 +108,15 @@ - teamone/master + teamone/master - My Computer + My Computer - git.team1.ourcompany.com + git.team1.ourcompany.com diff --git a/images/public-small-1.svg b/images/public-small-1.svg index 984dcd655..17b94ea9f 100644 --- a/images/public-small-1.svg +++ b/images/public-small-1.svg @@ -7,14 +7,14 @@ - 4b078 + 4b078 - 1edee + 1edee @@ -22,7 +22,7 @@ - 33009 + 33009 @@ -31,7 +31,7 @@ - 0d708 + 0d708 @@ -39,14 +39,14 @@ - e5b0f + e5b0f - a2de3 + a2de3 @@ -54,7 +54,7 @@ - master + master @@ -65,8 +65,8 @@ - origin/ - master + origin/ + master @@ -75,7 +75,7 @@ - featureA + featureA @@ -84,7 +84,7 @@ - featureB + featureB diff --git a/images/public-small-2.svg b/images/public-small-2.svg index 52c9ca208..d43027ae0 100644 --- a/images/public-small-2.svg +++ b/images/public-small-2.svg @@ -7,14 +7,14 @@ - 4b078 + 4b078 - 1edee + 1edee @@ -22,7 +22,7 @@ - 33009 + 33009 @@ -31,7 +31,7 @@ - 5399e + 5399e @@ -39,14 +39,14 @@ - e5b0f + e5b0f - dee6b + dee6b @@ -54,7 +54,7 @@ - master + master @@ -65,8 +65,8 @@ - origin/ - master + origin/ + master @@ -75,7 +75,7 @@ - featureA + featureA @@ -84,7 +84,7 @@ - featureB + featureB diff --git a/images/public-small-3.svg b/images/public-small-3.svg index e748e36ba..8aefc5d6c 100644 --- a/images/public-small-3.svg +++ b/images/public-small-3.svg @@ -7,14 +7,14 @@ - 4b078 + 4b078 - 1edee + 1edee @@ -22,7 +22,7 @@ - 33009 + 33009 @@ -31,7 +31,7 @@ - 5399e + 5399e @@ -40,7 +40,7 @@ - 17f4d + 17f4d @@ -48,14 +48,14 @@ - e5b0f + e5b0f - dee6b + dee6b @@ -63,7 +63,7 @@ - master + master @@ -74,8 +74,8 @@ - origin/ - master + origin/ + master @@ -84,7 +84,7 @@ - featureA + featureA @@ -93,7 +93,7 @@ - featureB + featureB @@ -102,7 +102,7 @@ - featureBv2 + featureBv2 diff --git a/images/rebasing-1.svg b/images/rebasing-1.svg index 99232aa8a..474d47851 100644 --- a/images/rebasing-1.svg +++ b/images/rebasing-1.svg @@ -8,7 +8,7 @@ - 0b743 + 0b743 @@ -16,14 +16,14 @@ - a6b4c + a6b4c - f42c5 + f42c5 @@ -31,7 +31,7 @@ - e43a6 + e43a6 @@ -39,7 +39,7 @@ - 5ddae + 5ddae @@ -47,7 +47,7 @@ - master + master @@ -56,7 +56,7 @@ - ruby_client + ruby_client diff --git a/images/rebasing-2.svg b/images/rebasing-2.svg index d64b41fcd..1d3d5723b 100644 --- a/images/rebasing-2.svg +++ b/images/rebasing-2.svg @@ -8,7 +8,7 @@ - 0b743 + 0b743 @@ -16,7 +16,7 @@ - a6b4c + a6b4c @@ -24,7 +24,7 @@ - f42c5 + f42c5 @@ -32,7 +32,7 @@ - a0a41 + a0a41 @@ -40,7 +40,7 @@ - master + master @@ -52,14 +52,14 @@ - e43a6 + e43a6 - 5ddae + 5ddae @@ -67,7 +67,7 @@ - ruby_client + ruby_client diff --git a/images/remote-branches-1.svg b/images/remote-branches-1.svg index 2ddcc1398..e17bead3b 100644 --- a/images/remote-branches-1.svg +++ b/images/remote-branches-1.svg @@ -9,14 +9,14 @@ - 0b743 + 0b743 - a6b4c + a6b4c @@ -24,27 +24,27 @@ - f4265 + f4265 - master + master - 0b743 + 0b743 - a6b4c + a6b4c @@ -52,36 +52,36 @@ - f4265 + f4265 - master + master - origin/master + origin/master - My Computer + My Computer - git.ourcompany.com + git.ourcompany.com - git clone janedoe@git.ourcompany.com:project.git + git clone janedoe@git.ourcompany.com:project.git - Remote branch + Remote branch - Local branch + Local branch diff --git a/images/remote-branches-2.svg b/images/remote-branches-2.svg index f44f8e5b4..379017e04 100644 --- a/images/remote-branches-2.svg +++ b/images/remote-branches-2.svg @@ -7,35 +7,35 @@ - 0b743 + 0b743 - a6b4c + a6b4c - f4265 + f4265 - 31b8e + 31b8e - 190a3 + 190a3 @@ -43,7 +43,7 @@ - master + master @@ -51,35 +51,35 @@ - 0b743 + 0b743 - a6b4c + a6b4c - f4265 + f4265 - a38de + a38de - 893cf + 893cf @@ -87,24 +87,24 @@ - master + master - origin/master + origin/master - My Computer + My Computer - git.ourcompany.com + git.ourcompany.com diff --git a/images/remote-branches-3.svg b/images/remote-branches-3.svg index 89fbc2a72..9a3aff250 100644 --- a/images/remote-branches-3.svg +++ b/images/remote-branches-3.svg @@ -7,35 +7,35 @@ - 0b743 + 0b743 - a6b4c + a6b4c - f4265 + f4265 - 31b8e + 31b8e - 190a3 + 190a3 @@ -43,21 +43,21 @@ - master + master - 0b743 + 0b743 - a6b4c + a6b4c @@ -65,7 +65,7 @@ - f4265 + f4265 @@ -74,27 +74,27 @@ - 31b8e + 31b8e - 190a3 + 190a3 - a38de + a38de - 893cf + 893cf @@ -102,7 +102,7 @@ - master + master @@ -111,21 +111,21 @@ - origin/master + origin/master - My Computer + My Computer - git.ourcompany.com + git.ourcompany.com - git fetch origin + git fetch origin diff --git a/images/remote-branches-4.svg b/images/remote-branches-4.svg index 5c48714a4..6ecbac58c 100644 --- a/images/remote-branches-4.svg +++ b/images/remote-branches-4.svg @@ -8,14 +8,14 @@ - 0b743 + 0b743 - a6b4c + a6b4c @@ -23,7 +23,7 @@ - f4265 + f4265 @@ -32,27 +32,27 @@ - 31b8e + 31b8e - 190a3 + 190a3 - a38de + a38de - 893cf + 893cf @@ -60,7 +60,7 @@ - master + master @@ -69,38 +69,38 @@ - origin/master + origin/master - My Computer + My Computer - git remote add teamone git://git.team1.ourcompany.com + git remote add teamone git://git.team1.ourcompany.com - f4265 + f4265 - 31b8e + 31b8e - 190a3 + 190a3 @@ -108,30 +108,30 @@ - master + master - git.ourcompany.com + git.ourcompany.com - origin + origin - f4265 + f4265 - 31b8e + 31b8e @@ -139,16 +139,16 @@ - master + master - git.team1.ourcompany.com + git.team1.ourcompany.com - teamone + teamone diff --git a/images/remote-branches-5.svg b/images/remote-branches-5.svg index 20034c71a..06e3c7bcf 100644 --- a/images/remote-branches-5.svg +++ b/images/remote-branches-5.svg @@ -7,14 +7,14 @@ - 0b743 + 0b743 - a6b4c + a6b4c @@ -22,7 +22,7 @@ - f4265 + f4265 @@ -31,27 +31,27 @@ - 31b8e + 31b8e - 190a3 + 190a3 - a38de + a38de - 893cf + 893cf @@ -59,7 +59,7 @@ - master + master @@ -68,7 +68,7 @@ - origin/master + origin/master @@ -77,16 +77,16 @@ - teamone/master + teamone/master - My Computer + My Computer - git fetch teamone + git fetch teamone @@ -94,21 +94,21 @@ - f4265 + f4265 - 31b8e + 31b8e - 190a3 + 190a3 @@ -116,30 +116,30 @@ - master + master - git.ourcompany.com + git.ourcompany.com - origin + origin - f4265 + f4265 - 31b8e + 31b8e @@ -147,16 +147,16 @@ - master + master - git.team1.ourcompany.com + git.team1.ourcompany.com - teamone + teamone diff --git a/images/replace1.svg b/images/replace1.svg index 8527e6f0b..ab5993522 100644 --- a/images/replace1.svg +++ b/images/replace1.svg @@ -9,7 +9,7 @@ - ef989 + ef989 @@ -18,7 +18,7 @@ - c6e1e + c6e1e @@ -28,7 +28,7 @@ - 9c68f + 9c68f @@ -38,7 +38,7 @@ - 94570 + 94570 @@ -48,7 +48,7 @@ - c1822 + c1822 @@ -57,7 +57,7 @@ - master + master diff --git a/images/replace2.svg b/images/replace2.svg index 856ce0744..de99c540f 100644 --- a/images/replace2.svg +++ b/images/replace2.svg @@ -9,7 +9,7 @@ - ef989 + ef989 @@ -18,7 +18,7 @@ - c6e1e + c6e1e @@ -28,7 +28,7 @@ - 9c68f + 9c68f @@ -38,7 +38,7 @@ - 94570 + 94570 @@ -48,7 +48,7 @@ - c1822 + c1822 @@ -57,14 +57,14 @@ - master + master - history + history diff --git a/images/replace3.svg b/images/replace3.svg index 880b94db0..9f814e083 100644 --- a/images/replace3.svg +++ b/images/replace3.svg @@ -8,7 +8,7 @@ - ef989 + ef989 @@ -17,7 +17,7 @@ - c6e1e + c6e1e @@ -27,7 +27,7 @@ - 9c68f + 9c68f @@ -37,7 +37,7 @@ - 94570 + 94570 @@ -47,13 +47,13 @@ - c1822 + c1822 - 622e8 + 622e8 @@ -66,7 +66,7 @@ - history + history diff --git a/images/replace4.svg b/images/replace4.svg index 02a14a547..6b7a1fd3c 100644 --- a/images/replace4.svg +++ b/images/replace4.svg @@ -28,7 +28,7 @@ - ef989 + ef989 @@ -37,7 +37,7 @@ - c6e1e + c6e1e @@ -48,7 +48,7 @@ - 9c68f + 9c68f @@ -57,7 +57,7 @@ - e146b + e146b @@ -67,7 +67,7 @@ - 81a70 + 81a70 @@ -77,7 +77,7 @@ - 94570 + 94570 @@ -87,13 +87,13 @@ - c1822 + c1822 - 622e8 + 622e8 @@ -106,14 +106,14 @@ - history + history - master + master diff --git a/images/replace5.svg b/images/replace5.svg index 999f4f330..fec213c4d 100644 --- a/images/replace5.svg +++ b/images/replace5.svg @@ -8,60 +8,60 @@ - e146b + e146b - fifth + fifth - replace + replace - 81a70 + 81a70 - fourth + fourth - third + third - 622e8 + 622e8 - c6e1e + c6e1e - instructions + instructions - 9c68f + 9c68f - 94570 + 94570 - second + second @@ -69,28 +69,28 @@ - master + master - c1822 + c1822 - fourth + fourth - third + third - first + first - history + history diff --git a/images/rerere1.svg b/images/rerere1.svg index 92803c2d8..e0cc7f1fb 100644 --- a/images/rerere1.svg +++ b/images/rerere1.svg @@ -17,32 +17,32 @@ - master + master - hello world + hello world - hola world + hola world - hello mundo + hello mundo - i18-world + i18-world diff --git a/images/rerere2.svg b/images/rerere2.svg index 150f3a67b..a3787accc 100644 --- a/images/rerere2.svg +++ b/images/rerere2.svg @@ -19,49 +19,49 @@ - master + master - hello world + hello world - hola world + hola world - hola mundo + hola mundo - hello mundo + hello mundo - i18-world + i18-world - rerere cache + rerere cache - - puts ‘hola world’ - - puts ‘hello mundo’ - ++ puts ‘hola mundo’ + - puts ‘hola world’ + - puts ‘hello mundo’ + ++ puts ‘hola mundo’ diff --git a/images/rerere3.svg b/images/rerere3.svg index 72093810d..e271f196c 100644 --- a/images/rerere3.svg +++ b/images/rerere3.svg @@ -18,56 +18,56 @@ - master + master - hello world + hello world - hola world + hola world - hola mundo + hola mundo - hello mundo + hello mundo - i18-world + i18-world - rerere cache + rerere cache - - puts ‘hola world’ - - puts ‘hello mundo’ - ++ puts ‘hola mundo’ + - puts ‘hola world’ + - puts ‘hello mundo’ + ++ puts ‘hola mundo’ - hello mundo + hello mundo - rebase + rebase diff --git a/images/reset-checkout.svg b/images/reset-checkout.svg index 293dbe396..b3f1c1035 100644 --- a/images/reset-checkout.svg +++ b/images/reset-checkout.svg @@ -9,14 +9,14 @@ - commit A + commit A - commit B + commit B @@ -24,7 +24,7 @@ - master + master @@ -33,7 +33,7 @@ - develop + develop @@ -42,7 +42,7 @@ - HEAD + HEAD @@ -56,14 +56,14 @@ - commit A + commit A - commit B + commit B @@ -71,7 +71,7 @@ - master + master @@ -80,7 +80,7 @@ - develop + develop @@ -89,7 +89,7 @@ - HEAD + HEAD @@ -108,14 +108,14 @@ - commit A + commit A - commit B + commit B @@ -123,7 +123,7 @@ - master + master @@ -132,7 +132,7 @@ - develop + develop @@ -141,7 +141,7 @@ - HEAD + HEAD diff --git a/images/reset-ex1.svg b/images/reset-ex1.svg index 7f8ec6751..d2a413608 100644 --- a/images/reset-ex1.svg +++ b/images/reset-ex1.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,28 +39,28 @@ - HEAD + HEAD - master + master - ? + ? - Git Repository + Git Repository - file.txt - v1 + file.txt + v1 diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg index 5763a4877..5e3417da4 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,39 +39,39 @@ - HEAD + HEAD - master + master - ? + ? - Git Repository + Git Repository - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - git add + git add diff --git a/images/reset-ex3.svg b/images/reset-ex3.svg index ab87a8227..72084c8c2 100644 --- a/images/reset-ex3.svg +++ b/images/reset-ex3.svg @@ -10,8 +10,8 @@ - Working - Directory + Working + Directory @@ -20,7 +20,7 @@ - Index + Index @@ -30,7 +30,7 @@ - HEAD + HEAD @@ -40,56 +40,56 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - git commit + git commit - eb43bf8 + eb43bf8 - eb43bf8 + eb43bf8 diff --git a/images/reset-ex4.svg b/images/reset-ex4.svg index effd8a6a3..73437340b 100644 --- a/images/reset-ex4.svg +++ b/images/reset-ex4.svg @@ -10,8 +10,8 @@ - Working - Directory + Working + Directory @@ -20,7 +20,7 @@ - Index + Index @@ -30,7 +30,7 @@ - HEAD + HEAD @@ -40,56 +40,56 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v2 + file.txt + v2 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - edit file + edit file - eb43bf8 + eb43bf8 - eb43bf8 + eb43bf8 diff --git a/images/reset-ex5.svg b/images/reset-ex5.svg index ffc64c988..7ae906f81 100644 --- a/images/reset-ex5.svg +++ b/images/reset-ex5.svg @@ -10,8 +10,8 @@ - Working - Directory + Working + Directory @@ -20,7 +20,7 @@ - Index + Index @@ -30,7 +30,7 @@ - HEAD + HEAD @@ -40,56 +40,56 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v2 + file.txt + v2 - file.txt - v2 + file.txt + v2 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - git add + git add - eb43bf8 + eb43bf8 - eb43bf8 + eb43bf8 diff --git a/images/reset-ex6.svg b/images/reset-ex6.svg index 1c58f566a..fde190d8d 100644 --- a/images/reset-ex6.svg +++ b/images/reset-ex6.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,71 +39,71 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v2 + file.txt + v2 - file.txt - v2 + file.txt + v2 - file.txt - v2 + file.txt + v2 - git commit + git commit - 9e5e6a4 + 9e5e6a4 - file.txt - v1 + file.txt + v1 - eb43bf8 + eb43bf8 - file.txt - v2 + file.txt + v2 - 9e5e6a4 + 9e5e6a4 diff --git a/images/reset-hard.svg b/images/reset-hard.svg index d788cc951..e2c0a2883 100644 --- a/images/reset-hard.svg +++ b/images/reset-hard.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,98 +39,98 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v2 + file.txt + v2 - file.txt - v2 + file.txt + v2 - file.txt - v2 + file.txt + v2 - git reset --hard HEAD~ + git reset --hard HEAD~ - 9e5e6a4 + 9e5e6a4 - file.txt - v1 + file.txt + v1 - eb43bf8 + eb43bf8 - file.txt - v2 + file.txt + v2 - 9e5e6a4 + 9e5e6a4 - file.txt - v3 + file.txt + v3 - 38eb946 + 38eb946 - 2 + 2 - 3 + 3 - 1 + 1 diff --git a/images/reset-mixed.svg b/images/reset-mixed.svg index 21df50614..50ed35df8 100644 --- a/images/reset-mixed.svg +++ b/images/reset-mixed.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,94 +39,94 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v3 + file.txt + v3 - file.txt - v2 + file.txt + v2 - file.txt - v2 + file.txt + v2 - git reset [--mixed] HEAD~ + git reset [--mixed] HEAD~ - 9e5e6a4 + 9e5e6a4 - file.txt - v1 + file.txt + v1 - eb43bf8 + eb43bf8 - file.txt - v2 + file.txt + v2 - 9e5e6a4 + 9e5e6a4 - file.txt - v3 + file.txt + v3 - 38eb946 + 38eb946 - 2 + 2 - 1 + 1 diff --git a/images/reset-path1.svg b/images/reset-path1.svg index 2aa4375eb..af3dba31f 100644 --- a/images/reset-path1.svg +++ b/images/reset-path1.svg @@ -10,8 +10,8 @@ - Working - Directory + Working + Directory @@ -20,7 +20,7 @@ - Index + Index @@ -30,7 +30,7 @@ - HEAD + HEAD @@ -40,57 +40,57 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v2 + file.txt + v2 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - git reset file.txt + git reset file.txt - eb43bf8 + eb43bf8 - eb43bf8 + eb43bf8 diff --git a/images/reset-path2.svg b/images/reset-path2.svg index 78c2e126b..ad3a9e606 100644 --- a/images/reset-path2.svg +++ b/images/reset-path2.svg @@ -10,8 +10,8 @@ - Working - Directory + Working + Directory @@ -20,7 +20,7 @@ - Index + Index @@ -30,7 +30,7 @@ - HEAD + HEAD @@ -40,57 +40,57 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v2 + file.txt + v2 - file.txt - v2 + file.txt + v2 - file.txt - v1 + file.txt + v1 - file.txt - v1 + file.txt + v1 - git add file.txt + git add file.txt - eb43bf8 + eb43bf8 - eb43bf8 + eb43bf8 diff --git a/images/reset-path3.svg b/images/reset-path3.svg index e57da4ae2..b8b515455 100644 --- a/images/reset-path3.svg +++ b/images/reset-path3.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,63 +39,63 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - git reset eb43 -- file.txt + git reset eb43 -- file.txt - 38eb946 + 38eb946 - file.txt - v1 + file.txt + v1 - eb43bf8 + eb43bf8 - file.txt - v2 + file.txt + v2 - 9e5e6a4 + 9e5e6a4 - file.txt - v3 + file.txt + v3 - 38eb946 + 38eb946 @@ -103,22 +103,22 @@ - file.txt - v1 + file.txt + v1 - file.txt - v3 + file.txt + v3 - file.txt - v3 + file.txt + v3 diff --git a/images/reset-soft.svg b/images/reset-soft.svg index d9a37694f..9fddd0f40 100644 --- a/images/reset-soft.svg +++ b/images/reset-soft.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,84 +39,84 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v3 + file.txt + v3 - file.txt - v3 + file.txt + v3 - file.txt - v2 + file.txt + v2 - git reset --soft HEAD~ + git reset --soft HEAD~ - 9e5e6a4 + 9e5e6a4 - file.txt - v1 + file.txt + v1 - eb43bf8 + eb43bf8 - file.txt - v2 + file.txt + v2 - 9e5e6a4 + 9e5e6a4 - file.txt - v3 + file.txt + v3 - 38eb946 + 38eb946 diff --git a/images/reset-squash-r1.svg b/images/reset-squash-r1.svg index 7012b15e3..753f997cf 100644 --- a/images/reset-squash-r1.svg +++ b/images/reset-squash-r1.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,33 +39,33 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - 38eb946 + 38eb946 - file-a.txt v1 + file-a.txt v1 - eb43bf8 + eb43bf8 @@ -73,36 +73,36 @@ - 9e5e6a4 + 9e5e6a4 - file-a.txt v2 + file-a.txt v2 - file-b.txt v1 + file-b.txt v1 - 38eb946 + 38eb946 - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -110,13 +110,13 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -124,13 +124,13 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -138,13 +138,13 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 diff --git a/images/reset-squash-r2.svg b/images/reset-squash-r2.svg index 86d097f27..2df998738 100644 --- a/images/reset-squash-r2.svg +++ b/images/reset-squash-r2.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,36 +39,36 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - git reset --soft HEAD~2 + git reset --soft HEAD~2 - eb43bf8 + eb43bf8 - file-a.txt v1 + file-a.txt v1 - eb43bf8 + eb43bf8 @@ -76,36 +76,36 @@ - 9e5e6a4 + 9e5e6a4 - file-a.txt v2 + file-a.txt v2 - file-b.txt v1 + file-b.txt v1 - 38eb946 + 38eb946 - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -113,13 +113,13 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -127,20 +127,20 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 - file-a.txt v1 + file-a.txt v1 diff --git a/images/reset-squash-r3.svg b/images/reset-squash-r3.svg index 9324a0d74..5915111c1 100644 --- a/images/reset-squash-r3.svg +++ b/images/reset-squash-r3.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,36 +39,36 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - git commit + git commit - 68aef35 + 68aef35 - file-a.txt v1 + file-a.txt v1 - eb43bf8 + eb43bf8 @@ -76,54 +76,54 @@ - 9e5e6a4 + 9e5e6a4 - file-a.txt v2 + file-a.txt v2 - file-b.txt v1 + file-b.txt v1 - 38eb946 + 38eb946 - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 - 68aef35 + 68aef35 - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -131,13 +131,13 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -145,13 +145,13 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 @@ -159,13 +159,13 @@ - file-a.txt v3 + file-a.txt v3 - file-b.txt v1 + file-b.txt v1 diff --git a/images/reset-start.svg b/images/reset-start.svg index 79e72536a..3424d7977 100644 --- a/images/reset-start.svg +++ b/images/reset-start.svg @@ -9,8 +9,8 @@ - Working - Directory + Working + Directory @@ -19,7 +19,7 @@ - Index + Index @@ -29,7 +29,7 @@ - HEAD + HEAD @@ -39,81 +39,81 @@ - HEAD + HEAD - master + master - Git Repository + Git Repository - file.txt - v3 + file.txt + v3 - file.txt - v3 + file.txt + v3 - file.txt - v3 + file.txt + v3 - 38eb946 + 38eb946 - file.txt - v1 + file.txt + v1 - eb43bf8 + eb43bf8 - file.txt - v2 + file.txt + v2 - 9e5e6a4 + 9e5e6a4 - file.txt - v3 + file.txt + v3 - 38eb946 + 38eb946 diff --git a/images/reset-workflow.svg b/images/reset-workflow.svg index b9b062865..bd19191db 100644 --- a/images/reset-workflow.svg +++ b/images/reset-workflow.svg @@ -10,20 +10,20 @@ - Working - Directory + Working + Directory - Index + Index - HEAD + HEAD diff --git a/images/small-team-1.svg b/images/small-team-1.svg index e131f6e56..4e2f5307e 100644 --- a/images/small-team-1.svg +++ b/images/small-team-1.svg @@ -7,7 +7,7 @@ - 4b078 + 4b078 @@ -15,7 +15,7 @@ - 1edee + 1edee @@ -24,7 +24,7 @@ - 738ee + 738ee @@ -32,7 +32,7 @@ - fbff5 + fbff5 @@ -40,7 +40,7 @@ - origin/master + origin/master @@ -49,7 +49,7 @@ - master + master diff --git a/images/small-team-2.svg b/images/small-team-2.svg index 923ebc9a2..a21cd68a0 100644 --- a/images/small-team-2.svg +++ b/images/small-team-2.svg @@ -7,7 +7,7 @@ - 4b078 + 4b078 @@ -15,7 +15,7 @@ - 1edee + 1edee @@ -24,7 +24,7 @@ - 738ee + 738ee @@ -33,14 +33,14 @@ - 72bbc + 72bbc - fbff5 + fbff5 @@ -48,7 +48,7 @@ - origin/master + origin/master @@ -57,7 +57,7 @@ - master + master diff --git a/images/small-team-3.svg b/images/small-team-3.svg index f8d77a409..6c8695923 100644 --- a/images/small-team-3.svg +++ b/images/small-team-3.svg @@ -7,7 +7,7 @@ - 4b078 + 4b078 @@ -15,7 +15,7 @@ - 1edee + 1edee @@ -24,7 +24,7 @@ - 738ee + 738ee @@ -33,14 +33,14 @@ - 72bbc + 72bbc - fbff5 + fbff5 @@ -49,7 +49,7 @@ - origin/master + origin/master @@ -59,7 +59,7 @@ - master + master diff --git a/images/small-team-4.svg b/images/small-team-4.svg index 483f09b6d..bb2c42556 100644 --- a/images/small-team-4.svg +++ b/images/small-team-4.svg @@ -7,7 +7,7 @@ - 4b078 + 4b078 @@ -15,7 +15,7 @@ - 1edee + 1edee @@ -24,7 +24,7 @@ - fbff5 + fbff5 @@ -33,7 +33,7 @@ - 8149a + 8149a @@ -42,7 +42,7 @@ - 23ac6 + 23ac6 @@ -50,7 +50,7 @@ - 4af42 + 4af42 @@ -58,7 +58,7 @@ - origin/master + origin/master @@ -67,7 +67,7 @@ - master + master @@ -76,7 +76,7 @@ - issue54 + issue54 diff --git a/images/small-team-5.svg b/images/small-team-5.svg index 176ade32d..0d5af3c3b 100644 --- a/images/small-team-5.svg +++ b/images/small-team-5.svg @@ -7,7 +7,7 @@ - 4b078 + 4b078 @@ -15,7 +15,7 @@ - 1edee + 1edee @@ -24,7 +24,7 @@ - fbff5 + fbff5 @@ -33,7 +33,7 @@ - 738ee + 738ee @@ -42,7 +42,7 @@ - 72bbc + 72bbc @@ -50,7 +50,7 @@ - 8149a + 8149a @@ -59,7 +59,7 @@ - 23ac6 + 23ac6 @@ -67,7 +67,7 @@ - 4af42 + 4af42 @@ -75,7 +75,7 @@ - origin/master + origin/master @@ -84,7 +84,7 @@ - master + master @@ -93,7 +93,7 @@ - issue54 + issue54 diff --git a/images/small-team-6.svg b/images/small-team-6.svg index 52ebe499d..888cb9957 100644 --- a/images/small-team-6.svg +++ b/images/small-team-6.svg @@ -7,7 +7,7 @@ - 4b078 + 4b078 @@ -15,7 +15,7 @@ - 1edee + 1edee @@ -24,7 +24,7 @@ - fbff5 + fbff5 @@ -33,7 +33,7 @@ - 738ee + 738ee @@ -42,7 +42,7 @@ - 72bbc + 72bbc @@ -50,7 +50,7 @@ - 8059c + 8059c @@ -58,7 +58,7 @@ - 8149a + 8149a @@ -67,7 +67,7 @@ - 23ac6 + 23ac6 @@ -75,7 +75,7 @@ - 4af42 + 4af42 @@ -83,7 +83,7 @@ - origin/master + origin/master @@ -92,7 +92,7 @@ - master + master @@ -101,7 +101,7 @@ - issue54 + issue54 diff --git a/images/small-team-7.svg b/images/small-team-7.svg index f0274abed..9ec840612 100644 --- a/images/small-team-7.svg +++ b/images/small-team-7.svg @@ -7,7 +7,7 @@ - 4b078 + 4b078 @@ -15,7 +15,7 @@ - 1edee + 1edee @@ -24,7 +24,7 @@ - fbff5 + fbff5 @@ -33,7 +33,7 @@ - 738ee + 738ee @@ -42,7 +42,7 @@ - 72bbc + 72bbc @@ -50,7 +50,7 @@ - 8059c + 8059c @@ -58,7 +58,7 @@ - 8149a + 8149a @@ -67,7 +67,7 @@ - 23ac6 + 23ac6 @@ -75,7 +75,7 @@ - 4af42 + 4af42 @@ -83,7 +83,7 @@ - origin/master + origin/master @@ -92,7 +92,7 @@ - master + master @@ -101,7 +101,7 @@ - issue54 + issue54 diff --git a/images/small-team-flow.svg b/images/small-team-flow.svg index 5a5a1bbf3..5b6241778 100644 --- a/images/small-team-flow.svg +++ b/images/small-team-flow.svg @@ -7,19 +7,19 @@ - Server + Server - John + John - Jessica + Jessica @@ -76,19 +76,19 @@ - Server + Server - John + John - Jessica + Jessica diff --git a/images/smudge.svg b/images/smudge.svg index d3203c513..54e86a3f9 100644 --- a/images/smudge.svg +++ b/images/smudge.svg @@ -8,59 +8,59 @@ - fileA.txt + fileA.txt - fileA.txt' + fileA.txt' - fileB.txt' + fileB.txt' - fileB.txt + fileB.txt - fileC.rb + fileC.rb - fileC.rb + fileC.rb - Staging Area + Staging Area - Working Directory + Working Directory - *.txt Filter + *.txt Filter - smudge + smudge - clean + clean diff --git a/images/snapshots.svg b/images/snapshots.svg index a098ed596..a566da902 100644 --- a/images/snapshots.svg +++ b/images/snapshots.svg @@ -35,67 +35,67 @@ - Version 1 + Version 1 - Version 2 + Version 2 - Version 3 + Version 3 - Version 4 + Version 4 - Version 5 + Version 5 - File A + File A - File A + File A - A1 + A1 - C1 + C1 - C2 + C2 - B1 + B1 @@ -131,31 +131,31 @@ - A2 + A2 - B2 + B2 - C3 + C3 - File B + File B - File C + File C diff --git a/images/symbols.svg b/images/symbols.svg index 01d3c2454..3d3feb704 100644 --- a/images/symbols.svg +++ b/images/symbols.svg @@ -7,151 +7,151 @@ - C6 + C6 - v1.0 + v1.0 - HEAD + HEAD - tree + tree - Version 5 + Version 5 - integration - manager + integration + manager - developer - public + developer + public - Staging - Area + Staging + Area - 9c68f + 9c68f - c2b9e + c2b9e - HEAD + HEAD - Working - Directory + Working + Directory - size - 92ec2 - Scott - Scott + size + 92ec2 + Scott + Scott - commit - - tree - author - committer + commit + + tree + author + committer - The initial commit of my project + The initial commit of my project - size - 5b1d3 README - 911e7 LICENSE - cba0a test.rb + size + 5b1d3 README + 911e7 LICENSE + cba0a test.rb - tree - - blob - blob - blob + tree + + blob + blob + blob - size + size - blob + blob - == Testing library - - This library is used to test - Ruby projects. + == Testing library + + This library is used to test + Ruby projects. - hello mundo + hello mundo - fbff5 + fbff5 - 738ee + 738ee - fba9a + fba9a diff --git a/images/topic-branches-1.svg b/images/topic-branches-1.svg index fcbbbea68..2eaf26d3e 100644 --- a/images/topic-branches-1.svg +++ b/images/topic-branches-1.svg @@ -7,122 +7,122 @@ - C0 + C0 - C1 + C1 - C3 + C3 - C9 + C9 - C10 + C10 - C2 + C2 - C4 + C4 - C5 + C5 - C6 + C6 - C12 + C12 - C13 + C13 - C7 + C7 - C8 + C8 - C11 + C11 - master + master - iss91 + iss91 - iss91v2 + iss91v2 - dumbidea + dumbidea diff --git a/images/topic-branches-2.svg b/images/topic-branches-2.svg index 8b61b5c6c..8cfa32795 100644 --- a/images/topic-branches-2.svg +++ b/images/topic-branches-2.svg @@ -7,56 +7,56 @@ - C0 + C0 - C1 + C1 - C3 + C3 - C9 + C9 - C10 + C10 - C2 + C2 - C4 + C4 - C13 + C13 @@ -64,53 +64,53 @@ - C14 + C14 - C12 + C12 - master + master - C7 + C7 - C8 + C8 - C11 + C11 - iss91v2 + iss91v2 - dumbidea + dumbidea diff --git a/images/two-branches.svg b/images/two-branches.svg index 9fe8e5a10..1153d8a62 100644 --- a/images/two-branches.svg +++ b/images/two-branches.svg @@ -11,31 +11,31 @@ - master + master - testing + testing - f30ab + f30ab - 34ac2 + 34ac2 - 98ca9 + 98ca9 diff --git a/images/undomerge-reset.svg b/images/undomerge-reset.svg index 732021961..a00ad2a55 100644 --- a/images/undomerge-reset.svg +++ b/images/undomerge-reset.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -16,7 +16,7 @@ - C2 + C2 @@ -25,21 +25,21 @@ - C5 + C5 - C3 + C3 - C4 + C4 @@ -47,7 +47,7 @@ - C6 + C6 @@ -57,7 +57,7 @@ - M + M @@ -67,7 +67,7 @@ - master + master @@ -76,7 +76,7 @@ - HEAD + HEAD @@ -86,7 +86,7 @@ - topic + topic diff --git a/images/undomerge-revert.svg b/images/undomerge-revert.svg index 9b27a3f05..e3e551d39 100644 --- a/images/undomerge-revert.svg +++ b/images/undomerge-revert.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -17,7 +17,7 @@ - C2 + C2 @@ -26,21 +26,21 @@ - C5 + C5 - C3 + C3 - C4 + C4 @@ -48,7 +48,7 @@ - C6 + C6 @@ -57,7 +57,7 @@ - M + M @@ -65,7 +65,7 @@ - ^M + ^M @@ -74,7 +74,7 @@ - master + master @@ -83,7 +83,7 @@ - HEAD + HEAD @@ -93,7 +93,7 @@ - topic + topic diff --git a/images/undomerge-revert2.svg b/images/undomerge-revert2.svg index 37c59247b..6d30796ce 100644 --- a/images/undomerge-revert2.svg +++ b/images/undomerge-revert2.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -17,7 +17,7 @@ - C2 + C2 @@ -26,21 +26,21 @@ - C5 + C5 - C3 + C3 - C4 + C4 @@ -48,7 +48,7 @@ - C6 + C6 @@ -56,7 +56,7 @@ - C7 + C7 @@ -64,7 +64,7 @@ - C8 + C8 @@ -72,7 +72,7 @@ - M + M @@ -80,7 +80,7 @@ - ^M + ^M @@ -89,7 +89,7 @@ - master + master @@ -98,7 +98,7 @@ - HEAD + HEAD @@ -108,7 +108,7 @@ - topic + topic diff --git a/images/undomerge-revert3.svg b/images/undomerge-revert3.svg index 9f3ee2fa2..d02714d13 100644 --- a/images/undomerge-revert3.svg +++ b/images/undomerge-revert3.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -17,7 +17,7 @@ - C2 + C2 @@ -26,21 +26,21 @@ - C5 + C5 - C3 + C3 - C4 + C4 @@ -48,7 +48,7 @@ - C6 + C6 @@ -56,7 +56,7 @@ - C7 + C7 @@ -64,7 +64,7 @@ - ^^M + ^^M @@ -73,7 +73,7 @@ - C8 + C8 @@ -81,7 +81,7 @@ - M + M @@ -89,7 +89,7 @@ - ^M + ^M @@ -98,7 +98,7 @@ - master + master @@ -107,7 +107,7 @@ - HEAD + HEAD @@ -117,7 +117,7 @@ - topic + topic diff --git a/images/undomerge-start.svg b/images/undomerge-start.svg index 893586c31..0d25b41d9 100644 --- a/images/undomerge-start.svg +++ b/images/undomerge-start.svg @@ -7,7 +7,7 @@ - C1 + C1 @@ -17,7 +17,7 @@ - C2 + C2 @@ -26,21 +26,21 @@ - C5 + C5 - C3 + C3 - C4 + C4 @@ -48,7 +48,7 @@ - C6 + C6 @@ -56,7 +56,7 @@ - M + M @@ -64,7 +64,7 @@ - master + master @@ -73,7 +73,7 @@ - HEAD + HEAD @@ -82,7 +82,7 @@ - topic + topic From 2560a819a0bf22e3c98b237996b24504a8032d7e Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Tue, 13 Aug 2019 20:49:02 +0200 Subject: [PATCH 05/23] Update reset-ex2.svg Texts at position, color and size adapted to the look of the corresponding PNG file --- images/reset-ex2.svg | 129 ++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 75 deletions(-) diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg index 5e3417da4..6f5879fd3 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -1,77 +1,56 @@ - - - - images/reset-ex2 - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - ? - - - - Git Repository - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - git add - + + + + + + image/svg+xml + + images/reset-ex2 + + + + images/reset-ex2 + Created with Sketch. + + + Working Directory + + + + + + Index + + + + + + + + HEAD + + + + + + + HEAD + + + + master + + + + ? + + + Git Repository + + file.txt v1 + + file.txt v1 + git add + From 775361c5d4857d91f90daea2679c39cb42b12f06 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Tue, 13 Aug 2019 20:53:27 +0200 Subject: [PATCH 06/23] Update reset-ex2.svg --- images/reset-ex2.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg index 6f5879fd3..804491eeb 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -1,5 +1,5 @@ - + From e37d917facba7e253aa8a1a5caed2a6471348ac6 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Thu, 15 Aug 2019 08:14:32 +0200 Subject: [PATCH 07/23] Update reset-ex2.svg --- images/reset-ex2.svg | 56 +++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg index 804491eeb..bc346d7cc 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -1,5 +1,5 @@ - + @@ -13,44 +13,30 @@ Created with Sketch. - Working Directory - - - - - - Index - - - - - - - - HEAD - - - - - - - - HEAD - - - - master - - + + + Index + + + HEAD + + + + HEAD + + master + ? - ? - Git Repository + Git Repository - file.txt v1 - file.txt v1 - git add + git add + + + WorkingDirectory + file.txtv1 + file.txtv1 From 43e89c4d47e2015982e160c4cb56f95962cc07ab Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Fri, 16 Aug 2019 08:38:49 +0200 Subject: [PATCH 08/23] Create reset-ex2_full.svg added full-size SVG for testing --- images/reset-ex2_full.svg | 357 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) create mode 100644 images/reset-ex2_full.svg diff --git a/images/reset-ex2_full.svg b/images/reset-ex2_full.svg new file mode 100644 index 000000000..e797487d3 --- /dev/null +++ b/images/reset-ex2_full.svg @@ -0,0 +1,357 @@ + + + + + + image/svg+xml + + images/reset-ex2 + + + + + + + + + + + + + + + images/reset-ex2 + Created with Sketch. + + + + + + + HEAD + + + + + + + + + HEAD + + + + + + master + + + + + ? + + + + Git Repository + + + + + + + Index + + + + + + file.txt + v1 + + + + + git add + + + + + + + file.txt + v1 + + + + + WorkingDirectory + + + + From bb33c21f81cd8fc9665f25eab1c2d9e3ef5fecee Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 17 Aug 2019 11:15:57 +0200 Subject: [PATCH 09/23] Create reset-ex2_new.svg new edited --- images/reset-ex2_new.svg | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 images/reset-ex2_new.svg diff --git a/images/reset-ex2_new.svg b/images/reset-ex2_new.svg new file mode 100644 index 000000000..c8069a6b2 --- /dev/null +++ b/images/reset-ex2_new.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + images/reset-ex2 + + + + + images/reset-ex2 + Created with Sketch. + + + + + + + Index + + + + + + + + HEAD + + + + + + + + HEAD + + + + master + + + ? + + Git Repository + + + + + WorkingDirectory + + + + file.txt v1 + + + + + file.txt v1 + + git add + + From 8102c935015b7074dd1f629a459bd1431fd9b1bb Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 17 Aug 2019 11:35:32 +0200 Subject: [PATCH 10/23] Update reset-ex2_new.svg --- images/reset-ex2_new.svg | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/images/reset-ex2_new.svg b/images/reset-ex2_new.svg index c8069a6b2..1b09266b3 100644 --- a/images/reset-ex2_new.svg +++ b/images/reset-ex2_new.svg @@ -13,7 +13,6 @@ images/reset-ex2 Created with Sketch. - @@ -50,15 +49,19 @@ WorkingDirectory - - - file.txt v1 - - + git add + + + + + + file.txtv1 + + + - file.txt v1 - git add + file.txtv1 From 413db8193cdba237c2f5cebb6c47518bd3e1890f Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Thu, 22 Aug 2019 20:50:33 +0200 Subject: [PATCH 11/23] SVG images checked and fixed (some redesigned) font-weight altered to "700" text positions and color fixed some files redesigned to look as former PNG files --- images/advance-master.svg | 76 ++++--- images/advance-testing.svg | 64 +++--- images/areas.svg | 54 ++--- images/basic-branching-1.svg | 69 +++--- images/basic-branching-2.svg | 81 ++++--- images/basic-branching-3.svg | 99 ++++----- images/basic-branching-4.svg | 129 ++++++----- images/basic-branching-5.svg | 129 +++++------ images/basic-branching-6.svg | 131 ++++++----- images/basic-merging-1.svg | 138 +++++------- images/basic-merging-2.svg | 143 ++++++------ images/basic-rebase-1.svg | 117 +++++----- images/basic-rebase-2.svg | 131 ++++++----- images/basic-rebase-3.svg | 133 ++++++----- images/basic-rebase-4.svg | 117 +++++----- images/benevolent-dictator.svg | 127 ++++++----- images/branch-and-history.svg | 129 +++++------ images/centralized.svg | 46 ++-- images/checkout-master.svg | 108 +++++---- images/clean.svg | 131 +++++------ images/commit-and-tree.svg | 168 +++++--------- images/commits-and-parents.svg | 162 +++++--------- images/data-model-1.svg | 121 +++++----- images/data-model-2.svg | 143 ++++++------ images/data-model-3.svg | 231 ++++++++----------- images/data-model-4.svg | 263 +++++++++------------- images/deltas.svg | 94 ++++---- images/distributed.svg | 136 ++++++------ images/double-dot.svg | 16 +- images/head-to-master.svg | 12 +- images/head-to-testing.svg | 12 +- images/integration-manager.svg | 129 +++++------ images/interesting-rebase-1.svg | 24 +- images/interesting-rebase-2.svg | 28 +-- images/interesting-rebase-3.svg | 24 +- images/interesting-rebase-4.svg | 30 +-- images/interesting-rebase-5.svg | 20 +- images/large-merges-1.svg | 36 +-- images/large-merges-2.svg | 383 ++++++++++++++------------------ images/lifecycle.svg | 106 ++++----- images/local.svg | 52 ++--- images/lr-branches-1.svg | 20 +- images/lr-branches-2.svg | 134 ++++++----- images/managed-team-1.svg | 16 +- images/managed-team-2.svg | 235 +++++++++----------- images/managed-team-3.svg | 32 +-- images/managed-team-flow.svg | 241 ++++++++------------ images/merging-workflows-1.svg | 20 +- images/merging-workflows-2.svg | 24 +- images/merging-workflows-3.svg | 16 +- images/merging-workflows-4.svg | 18 +- images/merging-workflows-5.svg | 18 +- images/perils-of-rebasing-1.svg | 123 +++++----- images/perils-of-rebasing-2.svg | 241 +++++++++----------- images/perils-of-rebasing-3.svg | 275 +++++++++++------------ images/perils-of-rebasing-4.svg | 293 +++++++++++------------- images/perils-of-rebasing-5.svg | 219 +++++++++--------- images/public-small-1.svg | 20 +- images/public-small-2.svg | 20 +- images/public-small-3.svg | 24 +- images/rebasing-1.svg | 14 +- images/rebasing-2.svg | 16 +- images/remote-branches-1.svg | 153 ++++++------- images/remote-branches-2.svg | 203 ++++++++--------- images/remote-branches-3.svg | 233 +++++++++---------- images/remote-branches-4.svg | 269 ++++++++++------------ images/remote-branches-5.svg | 283 ++++++++++------------- images/replace1.svg | 22 +- images/replace2.svg | 24 +- images/replace3.svg | 26 +-- images/replace4.svg | 199 +++++++---------- images/replace5.svg | 164 ++++++-------- images/rerere1.svg | 89 ++++---- images/rerere2.svg | 123 +++++----- images/rerere3.svg | 129 +++++------ images/reset-checkout.svg | 271 ++++++++++------------ images/reset-ex1.svg | 123 +++++----- images/reset-ex2.svg | 85 ++++--- images/reset-ex3.svg | 178 +++++++-------- images/reset-ex4.svg | 166 ++++++-------- images/reset-ex5.svg | 166 ++++++-------- images/reset-ex6.svg | 207 ++++++++--------- images/reset-hard.svg | 252 ++++++++++----------- images/reset-mixed.svg | 242 +++++++++----------- images/reset-path1.svg | 168 ++++++-------- images/reset-path2.svg | 168 ++++++-------- images/reset-path3.svg | 228 +++++++++---------- images/reset-soft.svg | 228 +++++++++---------- images/reset-squash-r1.svg | 280 +++++++++++------------ images/reset-squash-r2.svg | 282 ++++++++++++----------- images/reset-squash-r3.svg | 320 ++++++++++++-------------- images/reset-start.svg | 218 ++++++++---------- images/reset-workflow.svg | 88 ++++---- images/small-team-1.svg | 109 +++++---- images/small-team-2.svg | 14 +- images/small-team-3.svg | 14 +- images/small-team-4.svg | 18 +- images/small-team-5.svg | 22 +- images/small-team-6.svg | 24 +- images/small-team-7.svg | 24 +- images/small-team-flow.svg | 36 +-- images/smudge.svg | 131 +++++------ images/snapshots.svg | 273 +++++++++-------------- images/symbols.svg | 48 ++-- images/topic-branches-1.svg | 229 +++++++++---------- images/topic-branches-2.svg | 209 ++++++++--------- images/two-branches.svg | 84 +++---- images/undomerge-reset.svg | 173 +++++++-------- images/undomerge-revert.svg | 185 +++++++-------- images/undomerge-revert2.svg | 211 ++++++++---------- images/undomerge-revert3.svg | 227 +++++++++---------- images/undomerge-start.svg | 167 +++++++------- 112 files changed, 6464 insertions(+), 7682 deletions(-) diff --git a/images/advance-master.svg b/images/advance-master.svg index 746f6defd..4c260cbd7 100644 --- a/images/advance-master.svg +++ b/images/advance-master.svg @@ -1,6 +1,6 @@ - - - + + + image/svg+xml @@ -9,43 +9,53 @@ - images/advance-master - Created with Sketch. - + images/advance-master + Created with Sketch. + - - - + + + - + - - f30ab + + f30ab - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - - - 87ab2 + + + 87ab2 - - - c2b9e + + + c2b9e + + + + + + + testing + + + + + + + master + + + + + HEAD - - - testing - - - master - - - HEAD diff --git a/images/advance-testing.svg b/images/advance-testing.svg index b666bc721..2a061b127 100644 --- a/images/advance-testing.svg +++ b/images/advance-testing.svg @@ -1,6 +1,6 @@ - - - + + + image/svg+xml @@ -9,38 +9,44 @@ - images/advance-testing - Created with Sketch. - - + images/advance-testing + Created with Sketch. + + - - + + - - master - + + + master + + - - f30ab + + f30ab - - - 87ab2 + + + 87ab2 - - - 34ac2 + + + 34ac2 - - - 98ca9 + + + 98ca9 - - - testing - - - HEAD + + + + testing + + + + + HEAD + diff --git a/images/areas.svg b/images/areas.svg index 6088f1309..483f07f9d 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -1,6 +1,6 @@ - - - + + + image/svg+xml @@ -9,37 +9,37 @@ - images/areas - Created with Sketch. - - + images/areas + Created with Sketch. + + - - + + - - - - Working Directory + + + + Working Directory - - - Staging Area + + + Staging Area - - - .git directory (Repository) + + + .git directory (Repository) - - - - + + + + - - Checkout the project - Stage Fixes - Commit + + Checkout the project + Stage Fixes + Commit diff --git a/images/basic-branching-1.svg b/images/basic-branching-1.svg index 68ddb061e..a79e5d811 100644 --- a/images/basic-branching-1.svg +++ b/images/basic-branching-1.svg @@ -1,35 +1,36 @@ - - - - images/basic-branching-1 - Created with Sketch. - - - - - C0 - - - - - - - - - C1 - - - - - - C2 - - - - - - master - - - + + + + + + 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.svg b/images/basic-branching-2.svg index dc9e97fd9..6de510571 100644 --- a/images/basic-branching-2.svg +++ b/images/basic-branching-2.svg @@ -1,42 +1,41 @@ - - - - images/basic-branching-2 - Created with Sketch. - - - - - C0 - - - - - - - - - - C1 - - - - - - C2 - - - - - - master - - - - - - iss53 - - - + + + + + + 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.svg b/images/basic-branching-3.svg index 4d3160425..0192c1b4b 100644 --- a/images/basic-branching-3.svg +++ b/images/basic-branching-3.svg @@ -1,51 +1,50 @@ - - - - images/basic-branching-3 - Created with Sketch. - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - C3 - - - - - - - - - master - - - - - - - - iss53 - - - - + + + + + + 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.svg b/images/basic-branching-4.svg index 8ea190f90..59691bd24 100644 --- a/images/basic-branching-4.svg +++ b/images/basic-branching-4.svg @@ -1,69 +1,64 @@ - - - - images/basic-branching-4 - Created with Sketch. - - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - master - - - - - - - - - hotfix - - - - - - - C4 - - - - - - - C3 - - - - - - - - iss53 - - - - + + + + + + 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.svg b/images/basic-branching-5.svg index a93502218..d3d8e87d8 100644 --- a/images/basic-branching-5.svg +++ b/images/basic-branching-5.svg @@ -1,69 +1,62 @@ - - - - images/basic-branching-5 - Created with Sketch. - - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - master - - - - - - - - - hotfix - - - - - - - C4 - - - - - - - C3 - - - - - - - - iss53 - - - - - + + + + + + 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.svg b/images/basic-branching-6.svg index 61a4dc5d1..feaf578a5 100644 --- a/images/basic-branching-6.svg +++ b/images/basic-branching-6.svg @@ -1,69 +1,66 @@ - - - - images/basic-branching-6 - Created with Sketch. - - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - - - master - - - - - - - C4 - - - - - - - - C5 - - - - - - - C3 - - - - - - - - iss53 - - - + + + + + + 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.svg b/images/basic-merging-1.svg index 13bb20663..62560c499 100644 --- a/images/basic-merging-1.svg +++ b/images/basic-merging-1.svg @@ -1,79 +1,63 @@ - - - - images/basic-merging-1 - Created with Sketch. - - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - - - master - - - - - - - C4 - - - - - - - C5 - - - - - - C3 - - - - - - - - iss53 - - - - - Snapshot to - Merge In - - - Snapshot to - Merge Into - - - Common - Ancestor - + + + + + + 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.svg b/images/basic-merging-2.svg index ea7ffbb90..856d14357 100644 --- a/images/basic-merging-2.svg +++ b/images/basic-merging-2.svg @@ -1,77 +1,68 @@ - - - - images/basic-merging-2 - Created with Sketch. - - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - - - master - - - - - - - C4 - - - - - - - - C5 - - - - - - - - - C6 - - - - - - C3 - - - - - - - - iss53 - - - - + + + + + + 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.svg b/images/basic-rebase-1.svg index 133fce1e4..111bbf0d6 100644 --- a/images/basic-rebase-1.svg +++ b/images/basic-rebase-1.svg @@ -1,62 +1,57 @@ - - - - images/basic-rebase-1 - Created with Sketch. - - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - - - experiment - - - - - - - - C4 - - - - - - C3 - - - - - - - - - master - - - - + + + + + + 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.svg b/images/basic-rebase-2.svg index 58db7d6ee..6c1085198 100644 --- a/images/basic-rebase-2.svg +++ b/images/basic-rebase-2.svg @@ -1,70 +1,63 @@ - - - - images/basic-rebase-2 - Created with Sketch. - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - - - - experiment - - - - - - - C4 - - - - - - - - C3 - - - - - - - - C5 - - - - - - - - master - - - - + + + + + + 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.svg b/images/basic-rebase-3.svg index 0201534e7..9bb11f9ab 100644 --- a/images/basic-rebase-3.svg +++ b/images/basic-rebase-3.svg @@ -1,71 +1,64 @@ - - - - images/basic-rebase-3 - Created with Sketch. - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - - experiment - - - - - - - - - C4 - - - - - - - - - C3 - - - - - - - - C4' - - - - - - - - master - - - - + + + + + + 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.svg b/images/basic-rebase-4.svg index 6aba25d9e..f7ce55ae0 100644 --- a/images/basic-rebase-4.svg +++ b/images/basic-rebase-4.svg @@ -1,62 +1,57 @@ - - - - images/basic-rebase-4 - Created with Sketch. - - - - - - - C0 - - - - - - C1 - - - - - - C2 - - - - - - - - experiment - - - - - - - - - C3 - - - - - - - - C4' - - - - - - - - master - - - - + + + + + + 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.svg b/images/benevolent-dictator.svg index adb7d0f0a..a70712c19 100644 --- a/images/benevolent-dictator.svg +++ b/images/benevolent-dictator.svg @@ -1,67 +1,64 @@ - - - - images/benevolent-dictator - Created with Sketch. - - - - - - blessed - repository - - - - - - lieutenant - - - - - - lieutenant - - - - - - developer - public - - - - - - developer - public - - - - - - developer - public - - - - - - - - - - - - - - - - - dictator - - - + + + + + + image/svg+xml + + images/benevolent-dictator + + + + + images/benevolent-dictator + Created with Sketch. + + + + + + + + lieutenant + + + + + + lieutenant + + + + + + developerpublic + + + + + + + + + + + dictator + + + + developerpublic + + + + developerpublic + + + + + + blessedrepository + + + diff --git a/images/branch-and-history.svg b/images/branch-and-history.svg index 0cb32c950..2996565e1 100644 --- a/images/branch-and-history.svg +++ b/images/branch-and-history.svg @@ -1,70 +1,61 @@ - - - - images/branch-and-history - Created with Sketch. - - - - - - Snapshot C - - - - - - - Snapshot B - - - - - - - Snapshot A - - - - - - f30ab - - - - - - - - - 34ac2 - - - - - - 98ca9 - - - - - - - - master - - - - - - HEAD - - - - - - v1.0 - - - + + + + + + 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.svg b/images/centralized.svg index ec055ce69..b5583f1c7 100644 --- a/images/centralized.svg +++ b/images/centralized.svg @@ -1,6 +1,6 @@ - - - + + + image/svg+xml @@ -9,17 +9,31 @@ - images/centralized - Created with Sketch. - - shared repository - - developer - - developer - - developer - - - + images/centralized + Created with Sketch. + + + + + developer + + + + developer + + + + developer + + + + + + + + sharedrepository + + + + diff --git a/images/checkout-master.svg b/images/checkout-master.svg index b523eba70..04a1a20af 100644 --- a/images/checkout-master.svg +++ b/images/checkout-master.svg @@ -1,57 +1,53 @@ - - - - images/checkout-master - Created with Sketch. - - - - - - - - - master - - - - - - f30ab - - - - - - 87ab2 - - - - - - 34ac2 - - - - - - 98ca9 - - - - - - - testing - - - - - - - - HEAD - - - + + + + + + image/svg+xml + + images/checkout-master + + + + + images/checkout-master + Created with Sketch. + + + + + + + + + master + + + + f30ab + + + + 87ab2 + + + + 34ac2 + + + + 98ca9 + + + + + testing + + + + + HEAD + + + diff --git a/images/clean.svg b/images/clean.svg index 039fbbcc6..7807cedaf 100644 --- a/images/clean.svg +++ b/images/clean.svg @@ -1,73 +1,62 @@ - - - - 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 - - - - - - - - + + + + + + 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.svg b/images/commit-and-tree.svg index 0544273c7..682a4e52e 100644 --- a/images/commit-and-tree.svg +++ b/images/commit-and-tree.svg @@ -1,111 +1,61 @@ - - - - images/commit-and-tree - Created with Sketch. - - - - - 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. - - - - - - size - - - blob - - - The MIT License - - Copyright (c) 2008 Scott Chacon - - Permission is hereby granted, - free of charge, to any person - - - - - - size - - - blob - - - require 'logger' - require 'test/unit' - - - class Test::Unit::TestCase - - - - - 98ca9 - - - 92ec2 - - - 5b1d3 - - - 911e7 - - - cba0a - - - - - + + + + + + image/svg+xml + + images/commit-and-tree + + + + + images/commit-and-tree + Created with Sketch. + + + + + The initial commit of my project + + size 92ec2 Scott Scott + committreeauthorcommitter + + + + + + size 5b1d3 README 911e7 LICENSE cba0a test.rb + tree blob blob blob + + + + + size + blob + == Testing library This library is used to test Ruby projects. + + + + size + blob + The MIT License Copyright (c) 2008 Scott Chacon Permission is hereby granted, free of charge, to any person + + + + size + blob + require 'logger' require 'test/unit' class Test::Unit::TestCase + + 98ca9 + 92ec2 + 5b1d3 + 911e7 + cba0a + + + + + diff --git a/images/commits-and-parents.svg b/images/commits-and-parents.svg index e14ba05f2..a105e1c4b 100644 --- a/images/commits-and-parents.svg +++ b/images/commits-and-parents.svg @@ -1,105 +1,61 @@ - - - - images/commits-and-parents - Created with Sketch. - - - - - size - 92ec2 - - Scott - Scott - - - commit - - tree - parent - author - committer - - - The initial commit of my project - - - - - - Snapshot A - - - - - - - size - 184ca - 98ca9 - Scott - Scott - - - commit - - tree - parent - author - committer - - - Fixed bug #1328 - stack overflow - under certain conditions - - - - - - Snapshot B - - - - - 98ca9 - - - 34ac2 - - - - - - size - 0de24 - 34ac2 - Scott - Scott - - - commit - - tree - parent - author - committer - - - add feature #32 - ability to add new - formats to the central interface - - - - - - Snapshot C - - - - - f30ab - - + + + + + + image/svg+xml + + images/commits-and-parents + + + + + images/commits-and-parents + Created with Sketch. + + + + + + size 92ec2 Scott Scott + commit tree parent author committer + The initial commit of my project + + + + Snapshot A + + + + + + size 184ca 98ca9 Scott Scott + commit tree parent author committer + + Fixed bug #1328 - stack overflow under certain conditions + + + + Snapshot B + + + 98ca9 + 34ac2 + + + + size 0de24 34ac2 Scott Scott + commit tree parent author committer + add feature #32 - ability to add new formats to the central interface + + + + Snapshot C + + + f30ab + + + diff --git a/images/data-model-1.svg b/images/data-model-1.svg index 804f1a39c..5888cbe3e 100644 --- a/images/data-model-1.svg +++ b/images/data-model-1.svg @@ -1,66 +1,57 @@ - - - - images/data-model-1 - Created with Sketch. - - - - - blob - - - - - - blob - - - - - - blob - - - - - - - - - - simplegit.rb - - - - - - Rakefile - - - - - - README - - - - - - lib - - - - - - tree - - - - - - tree - - - + + + + + + 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.svg b/images/data-model-2.svg index 5945a52a2..a675500e6 100644 --- a/images/data-model-2.svg +++ b/images/data-model-2.svg @@ -1,81 +1,66 @@ - - - - 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 - - + + + + + + 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.svg b/images/data-model-3.svg index f28bb7931..0f03b451a 100644 --- a/images/data-model-3.svg +++ b/images/data-model-3.svg @@ -1,136 +1,97 @@ - - - - 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 - - - + + + + + + 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.svg b/images/data-model-4.svg index 22733b8b7..05b8bd8bd 100644 --- a/images/data-model-4.svg +++ b/images/data-model-4.svg @@ -1,154 +1,111 @@ - - - - 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 - - - + + + + + + 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.svg b/images/deltas.svg index bf4b46013..9dc3a541c 100644 --- a/images/deltas.svg +++ b/images/deltas.svg @@ -1,6 +1,6 @@ - - - + + + image/svg+xml @@ -9,53 +9,53 @@ - images/deltas - Created with Sketch. - - - Version 1 - - Version 2 - - Version 3 - - Version 4 - - Version 5 + images/deltas + Created with Sketch. + + + Version 1 + + Version 2 + + Version 3 + + Version 4 + + Version 5 - - File A + + File A - - File A - - Δ1 - - Δ1 - - Δ2 - - Δ1 - - Δ2 - - Δ2 - - Δ3 - - File B - - File C + + File A + + Δ1 + + Δ1 + + Δ2 + + Δ1 + + Δ2 + + Δ2 + + Δ3 + + File B + + File C - + - - - - - - - + + + + + + + - Checkins Over Time + Checkins Over Time diff --git a/images/distributed.svg b/images/distributed.svg index cb75dce5d..072dc4702 100644 --- a/images/distributed.svg +++ b/images/distributed.svg @@ -1,6 +1,6 @@ - - - + + + image/svg+xml @@ -9,91 +9,91 @@ - images/distributed - Created with Sketch. - - - - Version Database + images/distributed + Created with Sketch. + + + + Version Database - + - - Version 3 + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - - - - Server Computer - - - Version Database + + + + Server Computer + + + Version Database - - - - Version 3 + + + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - - - - - Computer A + + + + + Computer A - - File + + File - - - - Version Database + + + + Version Database - - - - Version 3 + + + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - - - - - Computer B + + + + + Computer B - - File + + File - - - - - + + + + + diff --git a/images/double-dot.svg b/images/double-dot.svg index aba13123f..6fa512364 100644 --- a/images/double-dot.svg +++ b/images/double-dot.svg @@ -6,7 +6,7 @@ - + A @@ -14,7 +14,7 @@ - + B @@ -23,7 +23,7 @@ - + E @@ -33,7 +33,7 @@ - + F @@ -42,7 +42,7 @@ - + C @@ -51,7 +51,7 @@ - + D @@ -60,7 +60,7 @@ - + master @@ -69,7 +69,7 @@ - + experiment diff --git a/images/head-to-master.svg b/images/head-to-master.svg index d27019890..653e08a7e 100644 --- a/images/head-to-master.svg +++ b/images/head-to-master.svg @@ -11,37 +11,37 @@ - + master - + testing - + f30ab - + 34ac2 - + 98ca9 - + HEAD diff --git a/images/head-to-testing.svg b/images/head-to-testing.svg index 07b06aa49..43ddd8dff 100644 --- a/images/head-to-testing.svg +++ b/images/head-to-testing.svg @@ -10,38 +10,38 @@ - + master - + testing - + f30ab - + 34ac2 - + 98ca9 - + HEAD diff --git a/images/integration-manager.svg b/images/integration-manager.svg index 87b65cc37..2661c070f 100644 --- a/images/integration-manager.svg +++ b/images/integration-manager.svg @@ -1,77 +1,56 @@ - - - - images/integration-manager - Created with Sketch. - - - - - - blessed - repository - - - - - - integration - manager - - - - - - developer - public - - - - - - developer - private - - - - - - - developer - public - - - - - - developer - private - - - - - - - - - - - - - - developer - public - - - - - - developer - private - - - - - + + + + + + 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.svg b/images/interesting-rebase-1.svg index 34f4d52ec..980bd5b48 100644 --- a/images/interesting-rebase-1.svg +++ b/images/interesting-rebase-1.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -49,7 +49,7 @@ - + C3 @@ -57,7 +57,7 @@ - + C4 @@ -65,21 +65,21 @@ - + C8 - + C9 - + C10 @@ -87,7 +87,7 @@ - + server @@ -96,7 +96,7 @@ - + client diff --git a/images/interesting-rebase-2.svg b/images/interesting-rebase-2.svg index ebaa39fa3..7c38d71d9 100644 --- a/images/interesting-rebase-2.svg +++ b/images/interesting-rebase-2.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,14 +58,14 @@ - + C9' - + C3 @@ -73,7 +73,7 @@ - + C4 @@ -82,14 +82,14 @@ - + C8 - + C9 @@ -97,7 +97,7 @@ - + C10 @@ -105,7 +105,7 @@ - + server @@ -114,7 +114,7 @@ - + client diff --git a/images/interesting-rebase-3.svg b/images/interesting-rebase-3.svg index 21e757ace..303c7845c 100644 --- a/images/interesting-rebase-3.svg +++ b/images/interesting-rebase-3.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,14 +58,14 @@ - + C9' - + C3 @@ -73,7 +73,7 @@ - + C4 @@ -81,7 +81,7 @@ - + C10 @@ -89,7 +89,7 @@ - + server @@ -98,7 +98,7 @@ - + client diff --git a/images/interesting-rebase-4.svg b/images/interesting-rebase-4.svg index e01c1d789..2f8d1d3c4 100644 --- a/images/interesting-rebase-4.svg +++ b/images/interesting-rebase-4.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,7 +58,7 @@ - + C9' @@ -66,7 +66,7 @@ - + C3' @@ -75,7 +75,7 @@ - + C4' @@ -83,7 +83,7 @@ - + C10' @@ -91,7 +91,7 @@ - + C3 @@ -99,7 +99,7 @@ - + C4 @@ -107,7 +107,7 @@ - + C10 @@ -116,7 +116,7 @@ - + server @@ -125,7 +125,7 @@ - + client diff --git a/images/interesting-rebase-5.svg b/images/interesting-rebase-5.svg index a3cf3e855..bf3922f56 100644 --- a/images/interesting-rebase-5.svg +++ b/images/interesting-rebase-5.svg @@ -6,7 +6,7 @@ - + C1 @@ -14,7 +14,7 @@ - + C2 @@ -23,7 +23,7 @@ - + C5 @@ -32,7 +32,7 @@ - + master @@ -41,7 +41,7 @@ - + C6 @@ -50,7 +50,7 @@ - + C8' @@ -58,7 +58,7 @@ - + C9' @@ -66,7 +66,7 @@ - + C3' @@ -75,7 +75,7 @@ - + C4' @@ -83,7 +83,7 @@ - + C10' diff --git a/images/large-merges-1.svg b/images/large-merges-1.svg index 575869acd..4f81e1b5a 100644 --- a/images/large-merges-1.svg +++ b/images/large-merges-1.svg @@ -8,7 +8,7 @@ - + master @@ -17,7 +17,7 @@ - + tv/rebase-stat @@ -26,7 +26,7 @@ - + jk/clone-checkout @@ -35,7 +35,7 @@ - + db/push-cleanup @@ -44,7 +44,7 @@ - + js/notes @@ -53,21 +53,21 @@ - + ps/blame - + C1 - + C2 @@ -78,31 +78,31 @@ - + C3 - + C5 - + C7 - + C9 - + C11 @@ -110,7 +110,7 @@ - + C4 @@ -119,7 +119,7 @@ - + C6 @@ -128,7 +128,7 @@ - + C8 @@ -137,7 +137,7 @@ - + C10 @@ -146,7 +146,7 @@ - + C12 diff --git a/images/large-merges-2.svg b/images/large-merges-2.svg index ffb14a608..9a5632339 100644 --- a/images/large-merges-2.svg +++ b/images/large-merges-2.svg @@ -1,213 +1,172 @@ - - - - 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 - - - - - + + + + + + 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.svg b/images/lifecycle.svg index 8b85bd90d..7e6ec6ab0 100644 --- a/images/lifecycle.svg +++ b/images/lifecycle.svg @@ -1,59 +1,49 @@ - - - - images/lifecycle - Created with Sketch. - - - - - - - - - - - - Modified - - - - - - - - - Edit the file - - - Add the file - - - Remove the file - - - Stage the file - - - - - Untracked - - - - - - Unmodified - - - - Commit - - - - - Staged - - - + + + + + + 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.svg b/images/local.svg index 17dfe71fb..dcc3a07ac 100644 --- a/images/local.svg +++ b/images/local.svg @@ -1,6 +1,6 @@ - - - + + + image/svg+xml @@ -9,36 +9,36 @@ - images/local - Created with Sketch. - - - - Local Computer - - Version Database - Checkout + images/local + Created with Sketch. + + + + Local Computer + + Version Database + Checkout - - File - + + File + - - Version 3 + + Version 3 - - - Version 2 + + + Version 2 - - - Version 1 + + + Version 1 - + - - + + diff --git a/images/lr-branches-1.svg b/images/lr-branches-1.svg index 03fe6048b..b45e12fe1 100644 --- a/images/lr-branches-1.svg +++ b/images/lr-branches-1.svg @@ -6,70 +6,70 @@ - + C1 - + C2 - + C3 - + C4 - + C5 - + C6 - + C7 - + master - + develop - + topic diff --git a/images/lr-branches-2.svg b/images/lr-branches-2.svg index 6ad634bf4..cafaeddea 100644 --- a/images/lr-branches-2.svg +++ b/images/lr-branches-2.svg @@ -1,73 +1,65 @@ - - - - images/lr-branches-2 - Created with Sketch. - - - - - - - - - - - - - C1 - - - - - - - - C2 - - - - - - - C3 - - - - - - - C4 - - - - - - - C5 - - - - - - C6 - - - - - - - C7 - - - - master - - - develop - - - topic - + + + + + + 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.svg b/images/managed-team-1.svg index 81439e85e..35623a146 100644 --- a/images/managed-team-1.svg +++ b/images/managed-team-1.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -29,14 +29,14 @@ - + 85127 - + e5b0f @@ -44,7 +44,7 @@ - + featureB @@ -53,7 +53,7 @@ - + master @@ -62,7 +62,7 @@ - + featureA diff --git a/images/managed-team-2.svg b/images/managed-team-2.svg index a2ceb0840..25362d43f 100644 --- a/images/managed-team-2.svg +++ b/images/managed-team-2.svg @@ -1,130 +1,109 @@ - - - - images/managed-team-2 - Created with Sketch. - - - - - - 4b078 - - - - - - - 1edee - - - - - - - - 33009 - - - - - - - - - aad88 - - - - - - - - - 774b3 - - - - - - - - - 85127 - - - - - - - - cd685 - - - - - - - fba9a - - - - - - - e5b0f - - - - - - - - - - origin/ - featureBee - - - - - - - - - featureB - - - - - - - - - master - - - - - - - - - - - origin/ - featureA - - - - - - - - - featureA - - - + + + + + + image/svg+xml + + images/managed-team-2 + + + + + images/managed-team-2 + Created with Sketch. + + + + + 4b078 + + + + + 1edee + + + + + + 33009 + + + + + + + aad88 + + + + + + + 774b3 + + + + + + + 85127 + + + + + + cd685 + + + + + fba9a + + + + + e5b0f + + + + + + + + + + origin/ featureBee + + + + featureB + + + + + + + master + + + + + + + + + + + + origin/ featureA + + + + featureA + + + diff --git a/images/managed-team-3.svg b/images/managed-team-3.svg index 4a901b349..931aa1b1f 100644 --- a/images/managed-team-3.svg +++ b/images/managed-team-3.svg @@ -8,14 +8,14 @@ - + 4b078 - + 1edee @@ -23,7 +23,7 @@ - + 33009 @@ -32,7 +32,7 @@ - + aad88 @@ -41,7 +41,7 @@ - + 774b3 @@ -49,7 +49,7 @@ - + 5399e @@ -57,7 +57,7 @@ - + 85127 @@ -65,21 +65,21 @@ - + cd685 - + fba9a - + e5b0f @@ -89,7 +89,7 @@ - + origin/ featureBee @@ -99,7 +99,7 @@ - + featureB @@ -108,7 +108,7 @@ - + master @@ -119,7 +119,7 @@ - + origin/ featureA @@ -131,7 +131,7 @@ - + origin/ master @@ -141,7 +141,7 @@ - + featureA diff --git a/images/managed-team-flow.svg b/images/managed-team-flow.svg index fdbbcc334..640dfbe13 100644 --- a/images/managed-team-flow.svg +++ b/images/managed-team-flow.svg @@ -1,149 +1,94 @@ - - - - images/managed-team-flow - Created with Sketch. - - - - - Josie - - - - - - - Josie - - - - - - John - - - - - - - John - - - - - - Jessica - - - - - - - Jessica - - - - - - - server: - featureA - - - - - - server: - featureA - - - - - - - server: - featureBee - - - - - - server: - featureBee - - - - - 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) - - - + + + + + + image/svg+xml + + images/managed-team-flow + + + + + images/managed-team-flow + Created with Sketch. + + + + Josie + + + + + Josie + + + + John + + + + + John + + + + Jessica + + + + + Jessica + + + + + server: featureA + + + + server: featureA + + + + + server: featureBee + + + + server: featureBee + + + 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) + + diff --git a/images/merging-workflows-1.svg b/images/merging-workflows-1.svg index 1c6300c8e..bb4ea74aa 100644 --- a/images/merging-workflows-1.svg +++ b/images/merging-workflows-1.svg @@ -7,7 +7,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -24,7 +24,7 @@ - + C7 @@ -32,7 +32,7 @@ - + C3 @@ -41,7 +41,7 @@ - + C4 @@ -50,7 +50,7 @@ - + C5 @@ -59,7 +59,7 @@ - + C6 @@ -68,7 +68,7 @@ - + master @@ -77,7 +77,7 @@ - + ruby_client @@ -86,7 +86,7 @@ - + php_client diff --git a/images/merging-workflows-2.svg b/images/merging-workflows-2.svg index db7faf9e8..52ba86dfd 100644 --- a/images/merging-workflows-2.svg +++ b/images/merging-workflows-2.svg @@ -7,7 +7,7 @@ - + C1 @@ -16,7 +16,7 @@ - + C2 @@ -24,7 +24,7 @@ - + C7 @@ -32,7 +32,7 @@ - + C3 @@ -41,7 +41,7 @@ - + C4 @@ -50,7 +50,7 @@ - + C9 @@ -59,7 +59,7 @@ - + C8 @@ -68,7 +68,7 @@ - + C5 @@ -76,7 +76,7 @@ - + C6 @@ -84,7 +84,7 @@ - + master @@ -93,7 +93,7 @@ - + ruby_client @@ -102,7 +102,7 @@ - + php_client diff --git a/images/merging-workflows-3.svg b/images/merging-workflows-3.svg index 0dd1c58b8..41fb32e0d 100644 --- a/images/merging-workflows-3.svg +++ b/images/merging-workflows-3.svg @@ -7,7 +7,7 @@ - + C1 @@ -15,14 +15,14 @@ - + C2 - + C5 @@ -30,7 +30,7 @@ - + C3 @@ -38,7 +38,7 @@ - + C4 @@ -46,7 +46,7 @@ - + develop @@ -55,7 +55,7 @@ - + master @@ -64,7 +64,7 @@ - + ruby_client diff --git a/images/merging-workflows-4.svg b/images/merging-workflows-4.svg index 833201257..45e6e3545 100644 --- a/images/merging-workflows-4.svg +++ b/images/merging-workflows-4.svg @@ -7,7 +7,7 @@ - + C1 @@ -15,14 +15,14 @@ - + C2 - + C5 @@ -30,7 +30,7 @@ - + C3 @@ -39,7 +39,7 @@ - + C4 @@ -48,7 +48,7 @@ - + C6 @@ -56,7 +56,7 @@ - + develop @@ -65,7 +65,7 @@ - + master @@ -74,7 +74,7 @@ - + ruby_client diff --git a/images/merging-workflows-5.svg b/images/merging-workflows-5.svg index 62b47dd86..3c40d5711 100644 --- a/images/merging-workflows-5.svg +++ b/images/merging-workflows-5.svg @@ -7,7 +7,7 @@ - + C1 @@ -15,14 +15,14 @@ - + C2 - + C5 @@ -30,7 +30,7 @@ - + C3 @@ -39,7 +39,7 @@ - + C4 @@ -48,7 +48,7 @@ - + C6 @@ -56,7 +56,7 @@ - + develop @@ -65,7 +65,7 @@ - + master @@ -74,7 +74,7 @@ - + ruby_client diff --git a/images/perils-of-rebasing-1.svg b/images/perils-of-rebasing-1.svg index 2afa0bef3..b960e6062 100644 --- a/images/perils-of-rebasing-1.svg +++ b/images/perils-of-rebasing-1.svg @@ -1,67 +1,58 @@ - - - - images/perils-of-rebasing-1 - Created with Sketch. - - - - - - - C1 - - - - - - - master - - - - - - C1 - - - - - - - C2 - - - - - - - C3 - - - - - - - - master - - - - - - - - - teamone/master - - - - - My Computer - - - git.team1.ourcompany.com - - + + + + + + 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.svg b/images/perils-of-rebasing-2.svg index bf2d826ca..b5dc69fc5 100644 --- a/images/perils-of-rebasing-2.svg +++ b/images/perils-of-rebasing-2.svg @@ -1,133 +1,110 @@ - - - - images/perils-of-rebasing-2 - Created with Sketch. - - - - - - - - C1 - - - - - - - - master - - - - - - - C1 - - - - - - - C2 - - - - - - - - C3 - - - - - - - - - C7 - - - - - - - - - C4 - - - - - - - - - C5 - - - - - - - - C6 - - - - - - - - - C4 - - - - - - - - - C5 - - - - - - - - C6 - - - - - - - - - master - - - - - - - - - teamone/master - - - - - My Computer - - - git.team1.ourcompany.com - - + + + + + + image/svg+xml + + images/perils-of-rebasing-2 + + + + + images/perils-of-rebasing-2 + Created with Sketch. + + + + + + + C1 + + + + + + master + + + + + C1 + + + + + C2 + + + + + + C3 + + + + + + + C7 + + + + + + + C4 + + + + + + + C5 + + + + + + C6 + + + + + + + C4 + + + + + + + C5 + + + + + + C6 + + + + + + + master + + + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + diff --git a/images/perils-of-rebasing-3.svg b/images/perils-of-rebasing-3.svg index 44f37d8df..a04edd033 100644 --- a/images/perils-of-rebasing-3.svg +++ b/images/perils-of-rebasing-3.svg @@ -1,153 +1,126 @@ - - - - images/perils-of-rebasing-3 - Created with Sketch. - - - - - - - - C1 - - - - - - - - master - - - - - - - C1 - - - - - - - C2 - - - - - - - - C3 - - - - - - - - - C7 - - - - - - - - - C4' - - - - - - - - - C4' - - - - - - - - C5 - - - - - - - - - C4 - - - - - - - - - - C6 - - - - - - - - - - C4 - - - - - - - - - C5 - - - - - - - - C6 - - - - - - - - - master - - - - - - - - - teamone/master - - - - - My Computer - - - git.team1.ourcompany.com - + + + + + + image/svg+xml + + images/perils-of-rebasing-3 + + + + + images/perils-of-rebasing-3 + Created with Sketch. + + + + + + + C1 + + + + + + master + + + + + C1 + + + + + C2 + + + + + + C3 + + + + + + + C7 + + + + + + + C4' + + + + + + + C4' + + + + + + C5 + + + + + + + C4 + + + + + + + C6 + + + + + + + + C4 + + + + + + + C5 + + + + + + C6 + + + + + + + master + + + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + diff --git a/images/perils-of-rebasing-4.svg b/images/perils-of-rebasing-4.svg index de25a2975..2d127dc7a 100644 --- a/images/perils-of-rebasing-4.svg +++ b/images/perils-of-rebasing-4.svg @@ -1,163 +1,134 @@ - - - - images/perils-of-rebasing-4 - Created with Sketch. - - - - - - - - - C1 - - - - - - - - master - - - - - - - C1 - - - - - - - C2 - - - - - - - - C3 - - - - - - - - - C7 - - - - - - - - - C8 - - - - - - - - - C4' - - - - - - - - - C4' - - - - - - - - C5 - - - - - - - - - C4 - - - - - - - - - - C6 - - - - - - - - - - C4 - - - - - - - - - C5 - - - - - - - - C6 - - - - - - - - - master - - - - - - - - - teamone/master - - - - - My Computer - - - git.team1.ourcompany.com - + + + + + + image/svg+xml + + images/perils-of-rebasing-4 + + + + + images/perils-of-rebasing-4 + Created with Sketch. + + + + + + + + C1 + + + + + + master + + + + + C1 + + + + + C2 + + + + + + C3 + + + + + + + C7 + + + + + + + C8 + + + + + + + C4' + + + + + + + C4' + + + + + + C5 + + + + + + + C4 + + + + + + + C6 + + + + + + + + C4 + + + + + + + C5 + + + + + + C6 + + + + + + + master + + + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + diff --git a/images/perils-of-rebasing-5.svg b/images/perils-of-rebasing-5.svg index b224ad089..f38cbd6fd 100644 --- a/images/perils-of-rebasing-5.svg +++ b/images/perils-of-rebasing-5.svg @@ -1,122 +1,101 @@ - - - - images/perils-of-rebasing-5 - Created with Sketch. - - - - - - - C1 - - - - - - - - master - - - - - - - C1 - - - - - - - - C4' - - - - - - - - - C4' - - - - - - - C2' - - - - - - - C3' - - - - - - - - C5 - - - - - - - - - C4 - - - - - - - - - - C6 - - - - - - - - - C5 - - - - - - - - master - - - - - - - - - teamone/master - - - - - My Computer - - - git.team1.ourcompany.com - + + + + + + image/svg+xml + + images/perils-of-rebasing-5 + + + + + images/perils-of-rebasing-5 + Created with Sketch. + + + + + + C1 + + + + + + master + + + + + C1 + + + + + + C4' + + + + + + + C4' + + + + + C2' + + + + + C3' + + + + + + C5 + + + + + + + C4 + + + + + + + C6 + + + + + + + C5 + + + + + + master + + + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com + diff --git a/images/public-small-1.svg b/images/public-small-1.svg index 17b94ea9f..994a324e5 100644 --- a/images/public-small-1.svg +++ b/images/public-small-1.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -30,7 +30,7 @@ - + 0d708 @@ -38,14 +38,14 @@ - + e5b0f - + a2de3 @@ -53,7 +53,7 @@ - + master @@ -64,7 +64,7 @@ - + origin/ master @@ -74,7 +74,7 @@ - + featureA @@ -83,7 +83,7 @@ - + featureB diff --git a/images/public-small-2.svg b/images/public-small-2.svg index d43027ae0..814245209 100644 --- a/images/public-small-2.svg +++ b/images/public-small-2.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -30,7 +30,7 @@ - + 5399e @@ -38,14 +38,14 @@ - + e5b0f - + dee6b @@ -53,7 +53,7 @@ - + master @@ -64,7 +64,7 @@ - + origin/ master @@ -74,7 +74,7 @@ - + featureA @@ -83,7 +83,7 @@ - + featureB diff --git a/images/public-small-3.svg b/images/public-small-3.svg index 8aefc5d6c..ec03c5382 100644 --- a/images/public-small-3.svg +++ b/images/public-small-3.svg @@ -6,14 +6,14 @@ - + 4b078 - + 1edee @@ -21,7 +21,7 @@ - + 33009 @@ -30,7 +30,7 @@ - + 5399e @@ -39,7 +39,7 @@ - + 17f4d @@ -47,14 +47,14 @@ - + e5b0f - + dee6b @@ -62,7 +62,7 @@ - + master @@ -73,7 +73,7 @@ - + origin/ master @@ -83,7 +83,7 @@ - + featureA @@ -92,7 +92,7 @@ - + featureB @@ -101,7 +101,7 @@ - + featureBv2 diff --git a/images/rebasing-1.svg b/images/rebasing-1.svg index 474d47851..67de0119d 100644 --- a/images/rebasing-1.svg +++ b/images/rebasing-1.svg @@ -7,7 +7,7 @@ - + 0b743 @@ -15,14 +15,14 @@ - + a6b4c - + f42c5 @@ -30,7 +30,7 @@ - + e43a6 @@ -38,7 +38,7 @@ - + 5ddae @@ -46,7 +46,7 @@ - + master @@ -55,7 +55,7 @@ - + ruby_client diff --git a/images/rebasing-2.svg b/images/rebasing-2.svg index 1d3d5723b..1daf4c159 100644 --- a/images/rebasing-2.svg +++ b/images/rebasing-2.svg @@ -7,7 +7,7 @@ - + 0b743 @@ -15,7 +15,7 @@ - + a6b4c @@ -23,7 +23,7 @@ - + f42c5 @@ -31,7 +31,7 @@ - + a0a41 @@ -39,7 +39,7 @@ - + master @@ -51,14 +51,14 @@ - + e43a6 - + 5ddae @@ -66,7 +66,7 @@ - + ruby_client diff --git a/images/remote-branches-1.svg b/images/remote-branches-1.svg index e17bead3b..52bf8f678 100644 --- a/images/remote-branches-1.svg +++ b/images/remote-branches-1.svg @@ -1,87 +1,68 @@ - - - - images/remote-branches-1 - Created with Sketch. - - - - - - - 0b743 - - - - - - - a6b4c - - - - - - - - f4265 - - - - - - master - - - - - - - 0b743 - - - - - - - a6b4c - - - - - - - - f4265 - - - - - - master - - - - - - origin/master - - - - My Computer - - - git.ourcompany.com - - - - git clone janedoe@git.ourcompany.com:project.git - - - Remote branch - - - Local branch - - + + + + + + image/svg+xml + + images/remote-branches-1 + + + + + images/remote-branches-1 + Created with Sketch. + + + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + master + + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + master + + + + origin/master + + My Computer + git.ourcompany.com + + git clone janedoe@git.ourcompany.com:project.git + Remote branch + Local branch + diff --git a/images/remote-branches-2.svg b/images/remote-branches-2.svg index 379017e04..da7808b0c 100644 --- a/images/remote-branches-2.svg +++ b/images/remote-branches-2.svg @@ -1,114 +1,91 @@ - - - - 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 - - + + + + + + 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.svg b/images/remote-branches-3.svg index 9a3aff250..cc6b0869b 100644 --- a/images/remote-branches-3.svg +++ b/images/remote-branches-3.svg @@ -1,131 +1,104 @@ - - - - images/remote-branches-3 - Created with Sketch. - - - - - 0b743 - - - - - - - a6b4c - - - - - - - f4265 - - - - - - - 31b8e - - - - - - - 190a3 - - - - - - - - master - - - - - - - 0b743 - - - - - - - a6b4c - - - - - - - - f4265 - - - - - - - - - 31b8e - - - - - - - 190a3 - - - - - - a38de - - - - - - - 893cf - - - - - - - - master - - - - - - - - - origin/master - - - - - - - My Computer - - - git.ourcompany.com - - - - git fetch origin - - + + + + + + image/svg+xml + + images/remote-branches-3 + + + + + images/remote-branches-3 + Created with Sketch. + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + + 0b743 + + + + + a6b4c + + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + + + + My Computer + git.ourcompany.com + + git fetch origin + diff --git a/images/remote-branches-4.svg b/images/remote-branches-4.svg index 6ecbac58c..5f1871709 100644 --- a/images/remote-branches-4.svg +++ b/images/remote-branches-4.svg @@ -1,154 +1,119 @@ - - - - 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 - + + + + + + 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.svg b/images/remote-branches-5.svg index 06e3c7bcf..1e14e9f91 100644 --- a/images/remote-branches-5.svg +++ b/images/remote-branches-5.svg @@ -1,162 +1,125 @@ - - - - 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 - + + + + + + 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.svg b/images/replace1.svg index ab5993522..b4cfb1fe3 100644 --- a/images/replace1.svg +++ b/images/replace1.svg @@ -8,55 +8,55 @@ - + ef989 - + fifth - + c6e1e - + fourth - + 9c68f - + third - + 94570 - + second - + c1822 - + first - + master diff --git a/images/replace2.svg b/images/replace2.svg index de99c540f..b386fffd9 100644 --- a/images/replace2.svg +++ b/images/replace2.svg @@ -8,62 +8,62 @@ - + ef989 - + fifth - + c6e1e - + fourth - + 9c68f - + third - + 94570 - + second - + c1822 - + first - + master - + history diff --git a/images/replace3.svg b/images/replace3.svg index 9f814e083..a81a61fe3 100644 --- a/images/replace3.svg +++ b/images/replace3.svg @@ -7,65 +7,65 @@ - + ef989 - + fifth - + c6e1e - + fourth - + 9c68f - + third - + 94570 - + second - + c1822 - + 622e8 - + first - + instructions - + history diff --git a/images/replace4.svg b/images/replace4.svg index 6b7a1fd3c..4bdeec1ae 100644 --- a/images/replace4.svg +++ b/images/replace4.svg @@ -1,120 +1,83 @@ - - - - images/replace4 - Created with Sketch. - - - - - - - - - - - - - - - - r - e - b - a - s - e - - - - - ef989 - - - - fifth - - - - - c6e1e - - - - fourth - - - - - - - 9c68f - - - - third - - - - - e146b - - - - fifth - - - - - - 81a70 - - - - fourth - - - - - - 94570 - - - - second - - - - - - c1822 - - - - - - 622e8 - - - - first - - - instructions - - - - - - history - - - - - - - master - - + + + + + + image/svg+xml + + images/replace4 + + + + + images/replace4 + Created with Sketch. + + + + + + + + + ef989 + fifth + + + + + c6e1e + + fourth + + + + + 9c68f + + third + + + e146b + + fifth + + + + 81a70 + + fourth + + + + 94570 + + second + + + + c1822 + + + + 622e8 + + first + instructions + + + + history + + + + + master + + + rebase + + + diff --git a/images/replace5.svg b/images/replace5.svg index fec213c4d..c93347211 100644 --- a/images/replace5.svg +++ b/images/replace5.svg @@ -1,97 +1,69 @@ - - - - images/replace5 - Created with Sketch. - - - - - - e146b - - - - fifth - - - - - replace - - - - - 81a70 - - - - fourth - - - - third - - - - - - 622e8 - - - - - - c6e1e - - - - instructions - - - - - 9c68f - - - - - - 94570 - - - - second - - - - - - - - master - - - - - - c1822 - - - - fourth - - - third - - - first - - - - - history - - - + + + + + + image/svg+xml + + images/replace5 + + + + + images/replace5 + Created with Sketch. + + + + + e146b + + fifth + + + replace + + + 81a70 + + fourth + + + + + 622e8 + + + + c6e1e + + instructions + + + 9c68f + + + + 94570 + + second + + + + + + master + + + + c1822 + + fourth + third + first + + + history + + diff --git a/images/rerere1.svg b/images/rerere1.svg index e0cc7f1fb..13f93ca0e 100644 --- a/images/rerere1.svg +++ b/images/rerere1.svg @@ -1,49 +1,42 @@ - - - - images/rerere1 - Created with Sketch. - - - - - - - - - - - - - - - master - - - - - - hello world - - - - - - hola world - - - - - - hello mundo - - - - - - - i18-world - - - + + + + + + image/svg+xml + + images/rerere1 + + + + + images/rerere1 + Created with Sketch. + + + + + + + + master + + + + hello world + + + + hola world + + + + hello mundo + + + + + i18-world + + diff --git a/images/rerere2.svg b/images/rerere2.svg index a3787accc..fceb43765 100644 --- a/images/rerere2.svg +++ b/images/rerere2.svg @@ -1,67 +1,58 @@ - - - - images/rerere2 - Created with Sketch. - - - - - - - - - - - - - - - - - master - - - - - - hello world - - - - - - hola world - - - - - - hola mundo - - - - - - hello mundo - - - - - - - i18-world - - - - - rerere cache - - - - - puts ‘hola world’ - - puts ‘hello mundo’ - ++ puts ‘hola mundo’ - - + + + + + + image/svg+xml + + images/rerere2 + + + + + images/rerere2 + Created with Sketch. + + + + + + + + + + master + + + + hello world + + + + hola world + + + + hola mundo + + + + hello mundo + + + + + i18-world + + + + + rerere cache + + + + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ + + + diff --git a/images/rerere3.svg b/images/rerere3.svg index e271f196c..5a39b190e 100644 --- a/images/rerere3.svg +++ b/images/rerere3.svg @@ -1,73 +1,58 @@ - - - - images/rerere3 - Created with Sketch. - - - - - - - - - - - - - - - - master - - - - - - hello world - - - - - - hola world - - - - - - hola mundo - - - - - - hello mundo - - - - - - - i18-world - - - - - rerere cache - - - - - puts ‘hola world’ - - puts ‘hello mundo’ - ++ puts ‘hola mundo’ - - - hello mundo - - - - rebase - - + + + + + + image/svg+xml + + images/rerere3 + + + + + images/rerere3 + Created with Sketch. + + + + + + + + + + + + + + master + + + + hello world + + + + hola world + + + + hola mundo + + + + + hello mundo + + + + + i18-world + + + rerere cache + + rebase + + - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ diff --git a/images/reset-checkout.svg b/images/reset-checkout.svg index b3f1c1035..c9851b4fc 100644 --- a/images/reset-checkout.svg +++ b/images/reset-checkout.svg @@ -1,151 +1,124 @@ - - - - images/reset-checkout - Created with Sketch. - - - - - - - commit A - - - - - - - commit B - - - - - - - - master - - - - - - - - - develop - - - - - - - - - HEAD - - - - - - before command - - - - - - - - commit A - - - - - - - commit B - - - - - - - - master - - - - - - - - - develop - - - - - - - - - HEAD - - - - - - after reset - - - - - - - after checkout - - - - - - commit A - - - - - - - commit B - - - - - - - - master - - - - - - - - - develop - - - - - - - - - HEAD - - - - - + + + + + + image/svg+xml + + images/reset-checkout + + + + + images/reset-checkout + Created with Sketch. + + + + + + commit A + + + + commit B + + + + + + master + + + + + + + develop + + + + + + + HEAD + + + + before command + + + + + + commit A + + + + + commit B + + + + + + master + + + + + + + develop + + + + + + + HEAD + + + + after reset + + + + + after checkout + + + + commit A + + + + + commit B + + + + + + master + + + + + + + develop + + + + + + + HEAD + + + + + diff --git a/images/reset-ex1.svg b/images/reset-ex1.svg index d2a413608..768227f30 100644 --- a/images/reset-ex1.svg +++ b/images/reset-ex1.svg @@ -1,67 +1,60 @@ - - - - images/reset-ex1 - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - ? - - - - Git Repository - - - - - file.txt - v1 - - + + + + + + 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.svg b/images/reset-ex2.svg index bc346d7cc..f4f0fb5b5 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -1,6 +1,6 @@ - - + + image/svg+xml @@ -9,34 +9,59 @@ - images/reset-ex2 - Created with Sketch. - - - - - Index - - - HEAD - - - - HEAD - - master - ? + + images/reset-ex2 + Created with Sketch. + + + + + + + HEAD + + + + + git add + + + + + file.txtv1 + + + + + + WorkingDirectory + + + + + + + + Index + + + + + file.txtv1 + + - - - Git Repository - - - git add - - - WorkingDirectory - file.txtv1 - file.txtv1 + ? + Git Repository + + + + + HEAD + + + + master + diff --git a/images/reset-ex3.svg b/images/reset-ex3.svg index 72084c8c2..44c643a95 100644 --- a/images/reset-ex3.svg +++ b/images/reset-ex3.svg @@ -1,95 +1,87 @@ - - - - images/reset-ex3 - Created with Sketch. - - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - git commit - - - eb43bf8 - - - eb43bf8 - + + + + + + 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.svg b/images/reset-ex4.svg index 73437340b..6fa4a42cd 100644 --- a/images/reset-ex4.svg +++ b/images/reset-ex4.svg @@ -1,95 +1,75 @@ - - - - images/reset-ex4 - Created with Sketch. - - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v2 - - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - edit file - - - eb43bf8 - - - eb43bf8 - + + + + + + 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.svg b/images/reset-ex5.svg index 7ae906f81..fc7067d3e 100644 --- a/images/reset-ex5.svg +++ b/images/reset-ex5.svg @@ -1,95 +1,75 @@ - - - - images/reset-ex5 - Created with Sketch. - - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v2 - - - - - - file.txt - v2 - - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - git add - - - eb43bf8 - - - eb43bf8 - + + + + + + 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.svg b/images/reset-ex6.svg index fde190d8d..4038dc115 100644 --- a/images/reset-ex6.svg +++ b/images/reset-ex6.svg @@ -1,111 +1,100 @@ - - - - images/reset-ex6 - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v2 - - - - - - file.txt - v2 - - - - - - file.txt - v2 - - - - git commit - - - 9e5e6a4 - - - - - - - file.txt - v1 - - - - eb43bf8 - - - - - - - file.txt - v2 - - - - - 9e5e6a4 - - - + + + + + + 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.svg b/images/reset-hard.svg index e2c0a2883..f5fe4271a 100644 --- a/images/reset-hard.svg +++ b/images/reset-hard.svg @@ -1,137 +1,119 @@ - - - - images/reset-hard - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v2 - - - - - - file.txt - v2 - - - - - - file.txt - v2 - - - - git reset --hard HEAD~ - - - 9e5e6a4 - - - - - - - file.txt - v1 - - - - eb43bf8 - - - - - - - file.txt - v2 - - - - - 9e5e6a4 - - - - - - - file.txt - v3 - - - - - 38eb946 - - - - - - - 2 - - - - 3 - - - 1 - - + + + + + + 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.svg b/images/reset-mixed.svg index 50ed35df8..c65c0e194 100644 --- a/images/reset-mixed.svg +++ b/images/reset-mixed.svg @@ -1,133 +1,113 @@ - - - - images/reset-mixed - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v3 - - - - - - file.txt - v2 - - - - - - file.txt - v2 - - - - git reset [--mixed] HEAD~ - - - 9e5e6a4 - - - - - - - file.txt - v1 - - - - eb43bf8 - - - - - - - file.txt - v2 - - - - - 9e5e6a4 - - - - - - - file.txt - v3 - - - - - 38eb946 - - - - - - - 2 - - - 1 - - + + + + + + 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.svg b/images/reset-path1.svg index af3dba31f..f4f774bd3 100644 --- a/images/reset-path1.svg +++ b/images/reset-path1.svg @@ -1,96 +1,76 @@ - - - - images/reset-path1 - Created with Sketch. - - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v2 - - - - - - file.txt - v1 - - - - - - file.txt - v1 - - - - - - - file.txt - v1 - - - - git reset file.txt - - - eb43bf8 - - - eb43bf8 - + + + + + + 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.svg b/images/reset-path2.svg index ad3a9e606..575e0d655 100644 --- a/images/reset-path2.svg +++ b/images/reset-path2.svg @@ -1,96 +1,76 @@ - - - - images/reset-path2 - Created with Sketch. - - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v2 - - - - - - file.txt - v2 - - - - - - file.txt - v1 - - - - - - - file.txt - v1 - - - - git add file.txt - - - eb43bf8 - - - eb43bf8 - + + + + + + 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.svg b/images/reset-path3.svg index b8b515455..9565e24f1 100644 --- a/images/reset-path3.svg +++ b/images/reset-path3.svg @@ -1,125 +1,107 @@ - - - - images/reset-path3 - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - git reset eb43 -- file.txt - - - 38eb946 - - - - - - - file.txt - v1 - - - - eb43bf8 - - - - - - - file.txt - v2 - - - - - 9e5e6a4 - - - - - - - file.txt - v3 - - - - - 38eb946 - - - - - - - - file.txt - v1 - - - - - - file.txt - v3 - - - - - - file.txt - v3 - - + + + + + + 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.svg b/images/reset-soft.svg index 9fddd0f40..09fe219d5 100644 --- a/images/reset-soft.svg +++ b/images/reset-soft.svg @@ -1,126 +1,106 @@ - - - - images/reset-soft - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v3 - - - - - - file.txt - v3 - - - - - - file.txt - v2 - - - - git reset --soft HEAD~ - - - 9e5e6a4 - - - - - - - file.txt - v1 - - - - eb43bf8 - - - - - - - file.txt - v2 - - - - - 9e5e6a4 - - - - - - - file.txt - v3 - - - - - 38eb946 - - - - - + + + + + + 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.svg b/images/reset-squash-r1.svg index 753f997cf..7aa6bf2e9 100644 --- a/images/reset-squash-r1.svg +++ b/images/reset-squash-r1.svg @@ -1,152 +1,132 @@ - - - - images/reset-squash-r1 - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - 38eb946 - - - - - - - file-a.txt v1 - - - - eb43bf8 - - - - - - - - 9e5e6a4 - - - - - file-a.txt v2 - - - - - - file-b.txt v1 - - - - - - - 38eb946 - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - + + + + + + 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.svg b/images/reset-squash-r2.svg index 2df998738..478592656 100644 --- a/images/reset-squash-r2.svg +++ b/images/reset-squash-r2.svg @@ -1,147 +1,139 @@ - - - - images/reset-squash-r2 - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - git reset --soft HEAD~2 - - - eb43bf8 - - - - - - - file-a.txt v1 - - - - eb43bf8 - - - - - - - - 9e5e6a4 - - - - - file-a.txt v2 - - - - - - file-b.txt v1 - - - - - - - 38eb946 - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - file-a.txt v1 - - + + + + + + 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.svg b/images/reset-squash-r3.svg index 5915111c1..144f0955d 100644 --- a/images/reset-squash-r3.svg +++ b/images/reset-squash-r3.svg @@ -1,177 +1,147 @@ - - - - images/reset-squash-r3 - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - git commit - - - 68aef35 - - - - - - - file-a.txt v1 - - - - eb43bf8 - - - - - - - - 9e5e6a4 - - - - - file-a.txt v2 - - - - - - file-b.txt v1 - - - - - - - 38eb946 - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - 68aef35 - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - - file-a.txt v3 - - - - - - file-b.txt v1 - - - - - - - + + + + + + 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.svg b/images/reset-start.svg index 3424d7977..380481424 100644 --- a/images/reset-start.svg +++ b/images/reset-start.svg @@ -1,122 +1,100 @@ - - - - images/reset-start - Created with Sketch. - - - - - - - Working - Directory - - - - - - - - - Index - - - - - - - - - - HEAD - - - - - - - - - - HEAD - - - - - - master - - - - - - Git Repository - - - - - file.txt - v3 - - - - - - file.txt - v3 - - - - - - file.txt - v3 - - - - 38eb946 - - - - - - - file.txt - v1 - - - - eb43bf8 - - - - - - - file.txt - v2 - - - - - 9e5e6a4 - - - - - - - file.txt - v3 - - - - - 38eb946 - - - - + + + + + + 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.svg b/images/reset-workflow.svg index bd19191db..35be798cb 100644 --- a/images/reset-workflow.svg +++ b/images/reset-workflow.svg @@ -1,42 +1,48 @@ - - - - images/reset-workflow - Created with Sketch. - - - - - - - - Working - Directory - - - - - - Index - - - - - - HEAD - - - - - - - Checkout the project - - - Stage Files - - - Commit - - + + + + + + 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.svg b/images/small-team-1.svg index 4e2f5307e..193b48515 100644 --- a/images/small-team-1.svg +++ b/images/small-team-1.svg @@ -1,57 +1,54 @@ - - - - images/small-team-1 - Created with Sketch. - - - - - 4b078 - - - - - - - - 1edee - - - - - - - - - 738ee - - - - - - - - fbff5 - - - - - - - - origin/master - - - - - - - - - master - - - - + + + + + + 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.svg b/images/small-team-2.svg index a21cd68a0..5c7037ee4 100644 --- a/images/small-team-2.svg +++ b/images/small-team-2.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + 738ee @@ -32,14 +32,14 @@ - + 72bbc - + fbff5 @@ -47,7 +47,7 @@ - + origin/master @@ -56,7 +56,7 @@ - + master diff --git a/images/small-team-3.svg b/images/small-team-3.svg index 6c8695923..f6e888bfc 100644 --- a/images/small-team-3.svg +++ b/images/small-team-3.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + 738ee @@ -32,14 +32,14 @@ - + 72bbc - + fbff5 @@ -48,7 +48,7 @@ - + origin/master @@ -58,7 +58,7 @@ - + master diff --git a/images/small-team-4.svg b/images/small-team-4.svg index bb2c42556..795a3569f 100644 --- a/images/small-team-4.svg +++ b/images/small-team-4.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 8149a @@ -41,7 +41,7 @@ - + 23ac6 @@ -49,7 +49,7 @@ - + 4af42 @@ -57,7 +57,7 @@ - + origin/master @@ -66,7 +66,7 @@ - + master @@ -75,7 +75,7 @@ - + issue54 diff --git a/images/small-team-5.svg b/images/small-team-5.svg index 0d5af3c3b..4c05449d8 100644 --- a/images/small-team-5.svg +++ b/images/small-team-5.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 738ee @@ -41,7 +41,7 @@ - + 72bbc @@ -49,7 +49,7 @@ - + 8149a @@ -58,7 +58,7 @@ - + 23ac6 @@ -66,7 +66,7 @@ - + 4af42 @@ -74,7 +74,7 @@ - + origin/master @@ -83,7 +83,7 @@ - + master @@ -92,7 +92,7 @@ - + issue54 diff --git a/images/small-team-6.svg b/images/small-team-6.svg index 888cb9957..005eb0bd8 100644 --- a/images/small-team-6.svg +++ b/images/small-team-6.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 738ee @@ -41,7 +41,7 @@ - + 72bbc @@ -49,7 +49,7 @@ - + 8059c @@ -57,7 +57,7 @@ - + 8149a @@ -66,7 +66,7 @@ - + 23ac6 @@ -74,7 +74,7 @@ - + 4af42 @@ -82,7 +82,7 @@ - + origin/master @@ -91,7 +91,7 @@ - + master @@ -100,7 +100,7 @@ - + issue54 diff --git a/images/small-team-7.svg b/images/small-team-7.svg index 9ec840612..74b50c7d5 100644 --- a/images/small-team-7.svg +++ b/images/small-team-7.svg @@ -6,7 +6,7 @@ - + 4b078 @@ -14,7 +14,7 @@ - + 1edee @@ -23,7 +23,7 @@ - + fbff5 @@ -32,7 +32,7 @@ - + 738ee @@ -41,7 +41,7 @@ - + 72bbc @@ -49,7 +49,7 @@ - + 8059c @@ -57,7 +57,7 @@ - + 8149a @@ -66,7 +66,7 @@ - + 23ac6 @@ -74,7 +74,7 @@ - + 4af42 @@ -82,7 +82,7 @@ - + origin/master @@ -91,7 +91,7 @@ - + master @@ -100,7 +100,7 @@ - + issue54 diff --git a/images/small-team-flow.svg b/images/small-team-flow.svg index 5b6241778..4129892b4 100644 --- a/images/small-team-flow.svg +++ b/images/small-team-flow.svg @@ -6,19 +6,19 @@ - + Server - + John - + Jessica @@ -26,68 +26,68 @@ - + 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.svg b/images/smudge.svg index 54e86a3f9..26b7f8232 100644 --- a/images/smudge.svg +++ b/images/smudge.svg @@ -1,73 +1,60 @@ - - - - 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 - - - - - - - - - + + + + + + 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.svg b/images/snapshots.svg index a566da902..f4af9c327 100644 --- a/images/snapshots.svg +++ b/images/snapshots.svg @@ -1,167 +1,108 @@ - - - - images/snapshots - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Version 1 - - - - - - Version 2 - - - - - - Version 3 - - - - - - Version 4 - - - - - - Version 5 - - - - - - File A - - - - - - File A - - - - - - A1 - - - - - - C1 - - - - - - C2 - - - - - - B1 - - - - - - B - - - - - - A1 - - - - - - A2 - - - - - - B - - - - - - C2 - - - - - - A2 - - - - - - B2 - - - - - - C3 - - - - - - File B - - - - - - File C - - - - - Checkins Over Time - - - + + + + + + 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 index 3d3feb704..164a1ebb3 100644 --- a/images/symbols.svg +++ b/images/symbols.svg @@ -6,108 +6,108 @@ - + 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 @@ -117,13 +117,13 @@ - + size - + blob - + == Testing library This library is used to test @@ -132,25 +132,25 @@ - + hello mundo - + fbff5 - + 738ee - + fba9a diff --git a/images/topic-branches-1.svg b/images/topic-branches-1.svg index 2eaf26d3e..09afb608c 100644 --- a/images/topic-branches-1.svg +++ b/images/topic-branches-1.svg @@ -1,129 +1,102 @@ - - - - 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 - - - + + + + + + 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.svg b/images/topic-branches-2.svg index 8cfa32795..3e29218f7 100644 --- a/images/topic-branches-2.svg +++ b/images/topic-branches-2.svg @@ -1,117 +1,94 @@ - - - - images/topic-branches-2 - Created with Sketch. - - - - - C0 - - - - - - - C1 - - - - - - - C3 - - - - - - - C9 - - - - - - - C10 - - - - - - - C2 - - - - - - - C4 - - - - - - - C13 - - - - - - - - C14 - - - - - - - C12 - - - - - - master - - - - - - - C7 - - - - - - - C8 - - - - - - - C11 - - - - - - iss91v2 - - - - - - dumbidea - - - + + + + + + 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.svg b/images/two-branches.svg index 1153d8a62..80c30fdf3 100644 --- a/images/two-branches.svg +++ b/images/two-branches.svg @@ -1,43 +1,43 @@ - - - - images/two-branches - Created with Sketch. - - - - - - - - - master - - - - - - testing - - - - - - f30ab - - - - - - 34ac2 - - - - - - 98ca9 - - - - + + + + + + image/svg+xml + + images/two-branches + + + + + images/two-branches + Created with Sketch. + + + + + + + + + master + + + + testing + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + diff --git a/images/undomerge-reset.svg b/images/undomerge-reset.svg index a00ad2a55..e9a0f8abf 100644 --- a/images/undomerge-reset.svg +++ b/images/undomerge-reset.svg @@ -1,94 +1,83 @@ - - - - images/undomerge-reset - Created with Sketch. - - - - - C1 - - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - C3 - - - - - - - C4 - - - - - - - - C6 - - - - - - - - - - M - - - - - - - - - - master - - - - - - - - - HEAD - - - - - - - - - - topic - - - + + + + + + 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.svg b/images/undomerge-revert.svg index e3e551d39..df81ae265 100644 --- a/images/undomerge-revert.svg +++ b/images/undomerge-revert.svg @@ -1,101 +1,88 @@ - - - - images/undomerge-revert - Created with Sketch. - - - - - C1 - - - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - C3 - - - - - - - C4 - - - - - - - - C6 - - - - - - - - - M - - - - - - - - ^M - - - - - - - - - master - - - - - - - - - HEAD - - - - - - - - - - topic - - - + + + + + + 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.svg b/images/undomerge-revert2.svg index 6d30796ce..146d80ebf 100644 --- a/images/undomerge-revert2.svg +++ b/images/undomerge-revert2.svg @@ -1,116 +1,99 @@ - - - - images/undomerge-revert2 - Created with Sketch. - - - - - C1 - - - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - C3 - - - - - - - C4 - - - - - - - - C6 - - - - - - - - C7 - - - - - - - - C8 - - - - - - - - M - - - - - - - - ^M - - - - - - - - - master - - - - - - - - - HEAD - - - - - - - - - - topic - - - + + + + + + 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.svg b/images/undomerge-revert3.svg index d02714d13..7459de450 100644 --- a/images/undomerge-revert3.svg +++ b/images/undomerge-revert3.svg @@ -1,125 +1,106 @@ - - - - images/undomerge-revert3 - Created with Sketch. - - - - - C1 - - - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - C3 - - - - - - - C4 - - - - - - - - C6 - - - - - - - - C7 - - - - - - - - ^^M - - - - - - - - - C8 - - - - - - - - M - - - - - - - - ^M - - - - - - - - - master - - - - - - - - - HEAD - - - - - - - - - - topic - - - + + + + + + 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.svg b/images/undomerge-start.svg index 0d25b41d9..8a9e3bb0d 100644 --- a/images/undomerge-start.svg +++ b/images/undomerge-start.svg @@ -1,90 +1,79 @@ - - - - images/undomerge-start - Created with Sketch. - - - - - C1 - - - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - C3 - - - - - - - C4 - - - - - - - - C6 - - - - - - - - M - - - - - - - - master - - - - - - - - - HEAD - - - - - - - - - topic - - - - + + + + + + image/svg+xml + + images/undomerge-start + + + + + images/undomerge-start + Created with Sketch. + + + + C1 + + + + + + + + C2 + + + + + + + C5 + + + + + C3 + + + + + C4 + + + + + + C6 + + + + + + M + + + + + + master + + + + + + + HEAD + + + + + + + topic + + + From 912bfe864d0e37e3e666902c5a0c526280f99a1f Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 24 Aug 2019 09:06:06 +0200 Subject: [PATCH 12/23] test files deleted --- images/reset-ex2_full.svg | 357 -------------------------------------- images/reset-ex2_new.svg | 67 ------- 2 files changed, 424 deletions(-) delete mode 100644 images/reset-ex2_full.svg delete mode 100644 images/reset-ex2_new.svg diff --git a/images/reset-ex2_full.svg b/images/reset-ex2_full.svg deleted file mode 100644 index e797487d3..000000000 --- a/images/reset-ex2_full.svg +++ /dev/null @@ -1,357 +0,0 @@ - - - - - - image/svg+xml - - images/reset-ex2 - - - - - - - - - - - - - - - images/reset-ex2 - Created with Sketch. - - - - - - - HEAD - - - - - - - - - HEAD - - - - - - master - - - - - ? - - - - Git Repository - - - - - - - Index - - - - - - file.txt - v1 - - - - - git add - - - - - - - file.txt - v1 - - - - - WorkingDirectory - - - - diff --git a/images/reset-ex2_new.svg b/images/reset-ex2_new.svg deleted file mode 100644 index 1b09266b3..000000000 --- a/images/reset-ex2_new.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - image/svg+xml - - images/reset-ex2 - - - - - images/reset-ex2 - Created with Sketch. - - - - - - Index - - - - - - - - HEAD - - - - - - - - HEAD - - - - master - - - ? - - Git Repository - - - - - WorkingDirectory - - - git add - - - - - - file.txtv1 - - - - - - file.txtv1 - - From d1a4b835431a6bdfe7df9f4ba74a2a9544160bc5 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 24 Aug 2019 13:57:46 +0200 Subject: [PATCH 13/23] Update advance-master.svg --- images/advance-master.svg | 56 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/advance-master.svg b/images/advance-master.svg index 4c260cbd7..4fede8f41 100644 --- a/images/advance-master.svg +++ b/images/advance-master.svg @@ -1,5 +1,5 @@ - + @@ -11,51 +11,51 @@ images/advance-master Created with Sketch. - + - + - - f30ab + + f30ab - - 34ac2 + + 34ac2 - - 98ca9 + + 98ca9 - - 87ab2 + + 87ab2 - - c2b9e + + c2b9e - - - - - testing + + + + + testing - - - - - master - - - - - HEAD + + + + + master + + + + + HEAD From 961ac4ec6972fdefe9033037fd1087a661c6f93f Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 24 Aug 2019 16:27:52 +0200 Subject: [PATCH 14/23] Update basic-merging-1.svg --- images/basic-merging-1.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/basic-merging-1.svg b/images/basic-merging-1.svg index 62560c499..012bc1d4f 100644 --- a/images/basic-merging-1.svg +++ b/images/basic-merging-1.svg @@ -57,7 +57,7 @@ Common Ancestor - Snapshot toMerge In + Snapshot toMerge In From 9736d797b3619d8b115ecdcc425034343486d766 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 24 Aug 2019 16:31:17 +0200 Subject: [PATCH 15/23] fixed --- images/areas.svg | 18 ++++---- images/commit-and-tree.svg | 84 +++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/images/areas.svg b/images/areas.svg index 483f07f9d..af53cc199 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -18,17 +18,15 @@ - - - Working Directory - - - Staging Area + + + StagingArea + - .git directory (Repository) + .git directory(Repository) @@ -42,4 +40,10 @@ Commit + + + + + WorkingDirectory + diff --git a/images/commit-and-tree.svg b/images/commit-and-tree.svg index 682a4e52e..3c3112b8d 100644 --- a/images/commit-and-tree.svg +++ b/images/commit-and-tree.svg @@ -1,5 +1,5 @@ - + @@ -12,50 +12,50 @@ images/commit-and-tree Created with Sketch. - - - - - The initial commit of my project - - size 92ec2 Scott Scott - committreeauthorcommitter + + + + + size 5b1d3 README 911e7 LICENSE cba0a test.rb + treeblobblobblob + + + + The initial commit of my project + + size 92ec2 Scott Scott + committreeauthorcommitter + 98ca9 - - - - - size 5b1d3 README 911e7 LICENSE cba0a test.rb - tree blob blob blob + 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 + + + + + + - - - size - blob - == Testing library This library is used to test Ruby projects. - - - - size - blob - The MIT License Copyright (c) 2008 Scott Chacon Permission is hereby granted, free of charge, to any person - - - - size - blob - require 'logger' require 'test/unit' class Test::Unit::TestCase - - 98ca9 - 92ec2 - 5b1d3 - 911e7 - cba0a - - - - From 732260078365aa9ab4d2ad0e9874c2609870e422 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Sat, 24 Aug 2019 17:35:27 +0200 Subject: [PATCH 16/23] minor fixes --- images/commits-and-parents.svg | 82 +++++++------- images/remote-branches-1.svg | 112 +++++++++--------- images/remote-branches-3.svg | 170 ++++++++++++++-------------- images/remote-branches-5.svg | 200 +++++++++++++++++---------------- images/reset-ex2.svg | 52 ++++----- 5 files changed, 317 insertions(+), 299 deletions(-) diff --git a/images/commits-and-parents.svg b/images/commits-and-parents.svg index a105e1c4b..ee786daa3 100644 --- a/images/commits-and-parents.svg +++ b/images/commits-and-parents.svg @@ -1,5 +1,5 @@ - + @@ -12,50 +12,48 @@ images/commits-and-parents Created with Sketch. - - - - - - size 92ec2 Scott Scott - commit tree parent author committer - - The initial commit of my project - - - - Snapshot A - - - - - - size 184ca 98ca9 Scott Scott - commit tree parent author committer - - Fixed bug #1328 - stack overflow under certain conditions - - - - Snapshot B + + + Snapshot A + + + + Snapshot B + + + 98ca9 + 34ac2 + + + + Snapshot C + + + f30ab + + + + Fixed bug #1328 - stack overflow under certain conditions + + size 184ca 98ca9 Scott Scott + committreeparentauthorcommitter - - 98ca9 - 34ac2 - - - - size 0de24 34ac2 Scott Scott - commit tree parent author committer - add feature #32 - ability to add new formats to the central interface + + + + The initial commit of my project + + size 92ec2 Scott Scott + committreeparentauthorcommitter - - - Snapshot C + + + + add feature #32 - ability to add new formats to the central interface + + size 0de24 34ac2 Scott Scott + committreeparentauthorcommitter - - f30ab - diff --git a/images/remote-branches-1.svg b/images/remote-branches-1.svg index 52bf8f678..955407610 100644 --- a/images/remote-branches-1.svg +++ b/images/remote-branches-1.svg @@ -1,5 +1,5 @@ - + @@ -12,57 +12,65 @@ images/remote-branches-1 Created with Sketch. - - - - - - 0b743 + + + + + + + + + 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 + - - - - a6b4c - - - - - - f4265 - - - - master - - - - - 0b743 - - - - - a6b4c - - - - - - f4265 - - - - master - - - - origin/master - - My Computer - git.ourcompany.com - - git clone janedoe@git.ourcompany.com:project.git - Remote branch - Local branch diff --git a/images/remote-branches-3.svg b/images/remote-branches-3.svg index cc6b0869b..2e74423f8 100644 --- a/images/remote-branches-3.svg +++ b/images/remote-branches-3.svg @@ -1,5 +1,5 @@ - + @@ -12,93 +12,97 @@ images/remote-branches-3 Created with Sketch. - - - - 0b743 - - - - - a6b4c - - - - - f4265 - - - - - 31b8e - - - - - 190a3 - - - - - - master + + + + + 0b743 - - - - 0b743 - - - - - a6b4c - - - - - - f4265 + + + + a6b4c - - - - - - 31b8e - - - - - 190a3 - - - - a38de - - - - - 893cf - - - - - - master + + + + + f4265 + + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + + master + + + + + + origin/master + + + + My Computer - - - - - origin/master + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + git.ourcompany.com - - - My Computer - git.ourcompany.com - - git fetch origin + git fetch origin + diff --git a/images/remote-branches-5.svg b/images/remote-branches-5.svg index 1e14e9f91..c3a2d3a0f 100644 --- a/images/remote-branches-5.svg +++ b/images/remote-branches-5.svg @@ -1,5 +1,5 @@ - + @@ -12,114 +12,120 @@ images/remote-branches-5 Created with Sketch. - - - - 0b743 - - - - - a6b4c - - - - - - f4265 + + + + + + 0b743 - - - - - - 31b8e - - - - - 190a3 - - - - a38de - - - - - 893cf - - - - - - master + + + + a6b4c - - - - - - origin/master + + + + + f4265 + - - - - - - teamone/master + + + + + 31b8e - - - My Computer - git fetch teamone - - - - - - f4265 + + + + 190a3 - - - - 31b8e + + + a38de - - - - 190a3 + + + + 893cf - - - - - master + + + + + master + + + + + origin/master + + + + + + + teamone/master + + + + My Computer - - git.ourcompany.com - origin - - - - f4265 - - - - - 31b8e + git fetch teamone + + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + + + + + git.ourcompany.com + origin - - - - - master + + + + + f4265 + + + + + 31b8e + + + + + + master + + + git.team1.ourcompany.com + teamone - - git.team1.ourcompany.com - teamone diff --git a/images/reset-ex2.svg b/images/reset-ex2.svg index f4f0fb5b5..9ba054f23 100644 --- a/images/reset-ex2.svg +++ b/images/reset-ex2.svg @@ -1,5 +1,5 @@ - + @@ -12,19 +12,19 @@ images/reset-ex2 Created with Sketch. - - - + + + - + HEAD - - git add - + + git add + @@ -37,31 +37,33 @@ WorkingDirectory - - - + + + - + Index - + file.txtv1 - - ? - Git Repository - - - - - HEAD - - - - master + ? + Git Repository + + + + + + HEAD + + + + master + + From 3325662d177903cdc6b28051f483f04bb1d2622c Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Wed, 28 Aug 2019 08:15:50 +0200 Subject: [PATCH 17/23] Update clean.svg arrow direction fixed --- images/clean.svg | 66 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/images/clean.svg b/images/clean.svg index 7807cedaf..1f054ef03 100644 --- a/images/clean.svg +++ b/images/clean.svg @@ -14,48 +14,48 @@ Created with Sketch. - - - - fileA.txt + + + + fileA.txt - - - - fileA.txt' + + + + fileA.txt' - - - fileB.txt' + + + fileB.txt' - - - fileB.txt + + + fileB.txt - - - fileC.rb + + + fileC.rb - - - fileC.rb + + + fileC.rb Staging Area Working Directory *.txt Filter - - - smudge - - - - clean - - - - - - + + + smudge + + + + clean + + + + + + From e9fd07a27c00f2d585329c09ab43309ab07c136c Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Wed, 28 Aug 2019 08:25:11 +0200 Subject: [PATCH 18/23] Update areas.svg --- images/areas.svg | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/images/areas.svg b/images/areas.svg index af53cc199..8f756f0f3 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -11,39 +11,39 @@ images/areas Created with Sketch. - - + + - + - StagingArea + StagingArea - .git directory(Repository) + .git directory(Repository) - + - + Checkout the project Stage Fixes Commit - - - - + + + + + WorkingDirectory - WorkingDirectory From cbc615debad5457102ff5447e395b74da0c717e0 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Wed, 28 Aug 2019 08:38:06 +0200 Subject: [PATCH 19/23] Update areas.svg --- images/areas.svg | 62 ++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/images/areas.svg b/images/areas.svg index 8f756f0f3..d9dc082d6 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -11,39 +11,43 @@ images/areas Created with Sketch. - - - - - - - - - - - StagingArea + + + + + + + + + + + + StagingArea + + + + + .git directory(Repository) - - - .git directory(Repository) + + + Checkout the project - - - - - - - - Checkout the project - Stage Fixes - Commit - - - - + + + Stage Fixes + + + + Commit + + + + + + WorkingDirectory - WorkingDirectory From 17d68e0269a298b115b5bdc7f6238ecd77a6da5a Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Wed, 28 Aug 2019 08:41:32 +0200 Subject: [PATCH 20/23] Update areas.svg --- images/areas.svg | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/areas.svg b/images/areas.svg index d9dc082d6..13ed34173 100644 --- a/images/areas.svg +++ b/images/areas.svg @@ -13,40 +13,40 @@ Created with Sketch. - - - - - - - + + + + + + + StagingArea - + .git directory(Repository) - - - - Checkout the project - - - - Stage Fixes - - - - Commit - - - - + + + Checkout the project + + + + Stage Fixes + + + + Commit + + + + + + WorkingDirectory - WorkingDirectory From 2cdbe48b47ba39742c363de8c0818312248710f0 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Wed, 28 Aug 2019 08:54:29 +0200 Subject: [PATCH 21/23] Update head-to-master.svg size of REFs fixed --- images/head-to-master.svg | 93 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 48 deletions(-) diff --git a/images/head-to-master.svg b/images/head-to-master.svg index 653e08a7e..285833a83 100644 --- a/images/head-to-master.svg +++ b/images/head-to-master.svg @@ -1,49 +1,46 @@ - - - - images/head-to-master - Created with Sketch. - - - - - - - - - - master - - - - - - testing - - - - - - f30ab - - - - - - 34ac2 - - - - - - 98ca9 - - - - - - HEAD - - - + + + + + + image/svg+xml + + images/head-to-master + + + + + images/head-to-master + Created with Sketch. + + + + + + + + + master + + + + testing + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + HEAD + + From d4a1ca5c9cf8b7583d4da51ace0fead57f1f4275 Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Wed, 28 Aug 2019 09:57:29 +0200 Subject: [PATCH 22/23] REFs resized --- images/double-dot.svg | 404 ++++++++++++++++++++++++++------ images/head-to-testing.svg | 93 ++++---- images/interesting-rebase-1.svg | 201 ++++++++-------- images/interesting-rebase-2.svg | 231 +++++++++--------- images/interesting-rebase-3.svg | 197 +++++++--------- images/interesting-rebase-4.svg | 239 +++++++++---------- 6 files changed, 777 insertions(+), 588 deletions(-) diff --git a/images/double-dot.svg b/images/double-dot.svg index 6fa512364..465b050e8 100644 --- a/images/double-dot.svg +++ b/images/double-dot.svg @@ -1,78 +1,330 @@ - - - - images/double-dot - Created with Sketch. - - - - - A - - - - - - - - B - - - - - - - - - E - - - - - - - - - - F - - - - - - - - - C - - - - - - - - - D - - - - - - - - - master - - - - - - - - - experiment - - - + + + + + + image/svg+xml + + images/double-dot + + + + + + + + + images/double-dot + Created with Sketch. + + + + + A + + + + + + + B + + + + + + + + + E + + + + + + + + + + F + + + + + + + + + C + + + + + + + + + D + + + + + + + + + master + + + + + + + + + experiment + + + + diff --git a/images/head-to-testing.svg b/images/head-to-testing.svg index 43ddd8dff..0ea2c506a 100644 --- a/images/head-to-testing.svg +++ b/images/head-to-testing.svg @@ -1,49 +1,46 @@ - - - - images/head-to-testing - Created with Sketch. - - - - - - - - - master - - - - - - testing - - - - - - f30ab - - - - - - 34ac2 - - - - - - 98ca9 - - - - - - - HEAD - - - + + + + + + image/svg+xml + + images/head-to-testing + + + + + images/head-to-testing + Created with Sketch. + + + + + + + + master + + + + testing + + + + f30ab + + + + 34ac2 + + + + 98ca9 + + + + + HEAD + + diff --git a/images/interesting-rebase-1.svg b/images/interesting-rebase-1.svg index 980bd5b48..5c520bf9b 100644 --- a/images/interesting-rebase-1.svg +++ b/images/interesting-rebase-1.svg @@ -1,105 +1,98 @@ - - - - images/interesting-rebase-1 - Created with Sketch. - - - - - C1 - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - - - master - - - - - - - - - C6 - - - - - - - - C3 - - - - - - - - C4 - - - - - - - - C8 - - - - - - - C9 - - - - - - - C10 - - - - - - - - server - - - - - - - - - client - - - - + + + + + + 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.svg b/images/interesting-rebase-2.svg index 7c38d71d9..fb5feecb5 100644 --- a/images/interesting-rebase-2.svg +++ b/images/interesting-rebase-2.svg @@ -1,123 +1,110 @@ - - - - images/interesting-rebase-2 - Created with Sketch. - - - - - C1 - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - - - master - - - - - - - - - C6 - - - - - - - - - C8' - - - - - - - - C9' - - - - - - - C3 - - - - - - - - C4 - - - - - - - - - C8 - - - - - - - C9 - - - - - - - - C10 - - - - - - - - server - - - - - - - - - client - - - - + + + + + + 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.svg b/images/interesting-rebase-3.svg index 303c7845c..cb5e2e633 100644 --- a/images/interesting-rebase-3.svg +++ b/images/interesting-rebase-3.svg @@ -1,107 +1,92 @@ - - - - images/interesting-rebase-3 - Created with Sketch. - - - - - C1 - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - - - master - - - - - - - - - C6 - - - - - - - - - C8' - - - - - - - - C9' - - - - - - - C3 - - - - - - - - C4 - - - - - - - - C10 - - - - - - - - server - - - - - - - - - client - - - - + + + + + + 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.svg b/images/interesting-rebase-4.svg index 2f8d1d3c4..df0604b32 100644 --- a/images/interesting-rebase-4.svg +++ b/images/interesting-rebase-4.svg @@ -1,134 +1,109 @@ - - - - images/interesting-rebase-4 - Created with Sketch. - - - - - C1 - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - - - master - - - - - - - - - C6 - - - - - - - - - C8' - - - - - - - - C9' - - - - - - - - C3' - - - - - - - - - C4' - - - - - - - - C10' - - - - - - - - C3 - - - - - - - - C4 - - - - - - - - C10 - - - - - - - - - server - - - - - - - - - client - - - + + + + + + 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 + + + From fba09b9cc3bfa0e3b3994ef425157f3554b724cd Mon Sep 17 00:00:00 2001 From: Dieter Ziller Date: Thu, 29 Aug 2019 11:00:05 +0200 Subject: [PATCH 23/23] Ref sizes fixed --- images/basic-branching-1.svg | 38 ++--- images/interesting-rebase-5.svg | 163 +++++++++---------- images/large-merges-1.svg | 279 ++++++++++++++------------------ images/large-merges-2.svg | 250 ++++++++++++++-------------- images/lr-branches-1.svg | 147 ++++++++--------- images/managed-team-1.svg | 125 +++++++------- images/managed-team-2.svg | 86 +++++----- images/managed-team-3.svg | 264 +++++++++++++----------------- images/managed-team-flow.svg | 36 ++--- images/merging-workflows-1.svg | 177 ++++++++++---------- images/merging-workflows-2.svg | 209 ++++++++++++------------ images/merging-workflows-3.svg | 137 ++++++++-------- images/merging-workflows-4.svg | 155 +++++++++--------- images/merging-workflows-5.svg | 155 +++++++++--------- images/perils-of-rebasing-1.svg | 68 ++++---- images/perils-of-rebasing-2.svg | 160 +++++++++--------- images/perils-of-rebasing-3.svg | 224 +++++++++++++------------ images/perils-of-rebasing-4.svg | 216 +++++++++++++------------ images/perils-of-rebasing-5.svg | 128 ++++++++------- images/public-small-1.svg | 172 ++++++++++---------- images/public-small-2.svg | 166 +++++++++---------- images/public-small-3.svg | 214 ++++++++++++------------ images/rebasing-1.svg | 119 +++++++------- images/rebasing-2.svg | 143 ++++++++-------- images/remote-branches-1.svg | 116 ++++++------- images/remote-branches-2.svg | 148 ++++++++--------- images/remote-branches-3.svg | 168 ++++++++++--------- images/remote-branches-4.svg | 190 +++++++++++----------- images/remote-branches-5.svg | 142 ++++++++-------- images/replace1.svg | 115 ++++++------- images/replace2.svg | 133 ++++++++------- images/replace3.svg | 142 ++++++++-------- images/replace4.svg | 142 ++++++++-------- images/replace5.svg | 126 +++++++++------ images/rerere1.svg | 54 ++++--- images/rerere2.svg | 96 ++++++----- images/rerere3.svg | 137 +++++++++++----- images/reset-checkout.svg | 180 ++++++++++----------- images/small-team-1.svg | 58 +++---- images/small-team-2.svg | 127 ++++++++------- images/small-team-3.svg | 129 ++++++++------- images/small-team-4.svg | 157 +++++++++--------- images/small-team-5.svg | 189 ++++++++++------------ images/small-team-6.svg | 207 ++++++++++++------------ images/small-team-7.svg | 207 ++++++++++++------------ images/small-team-flow.svg | 161 ++++++++---------- images/topic-branches-1.svg | 172 ++++++++++---------- images/topic-branches-2.svg | 174 +++++++++++--------- images/two-branches.svg | 36 +++-- 49 files changed, 3617 insertions(+), 3720 deletions(-) diff --git a/images/basic-branching-1.svg b/images/basic-branching-1.svg index a79e5d811..d977cfbf6 100644 --- a/images/basic-branching-1.svg +++ b/images/basic-branching-1.svg @@ -12,25 +12,25 @@ images/basic-branching-1 Created with Sketch. - - - - C0 - - - - - - - C1 - - - - C2 - - - - master + + + C0 + + + + + + C1 + + + + C2 + + + + + + master diff --git a/images/interesting-rebase-5.svg b/images/interesting-rebase-5.svg index bf3922f56..18907ad93 100644 --- a/images/interesting-rebase-5.svg +++ b/images/interesting-rebase-5.svg @@ -1,91 +1,74 @@ - - - - images/interesting-rebase-5 - Created with Sketch. - - - - - C1 - - - - - - - - C2 - - - - - - - - - C5 - - - - - - - - - master - - - - - - - - - C6 - - - - - - - - - C8' - - - - - - - - C9' - - - - - - - - C3' - - - - - - - - - C4' - - - - - - - - C10' - - - + + + + + + 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/large-merges-1.svg b/images/large-merges-1.svg index 4f81e1b5a..534f87483 100644 --- a/images/large-merges-1.svg +++ b/images/large-merges-1.svg @@ -1,155 +1,126 @@ - - - - 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 - - - - + + + + + + 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.svg b/images/large-merges-2.svg index 9a5632339..d8f782c82 100644 --- a/images/large-merges-2.svg +++ b/images/large-merges-2.svg @@ -1,5 +1,5 @@ - + @@ -12,161 +12,161 @@ images/large-merges-2 Created with Sketch. - - - - - - master + + + + + + master - - - - - tv/rebase-stat + + + + + tv/rebase-stat - - - - - jk/clone-checkout + + + + + jk/clone-checkout - - - - - db/push-cleanup + + + + + db/push-cleanup - - - - - js/notes + + + + + js/notes - - - - - pu + + + + + pu - - + + - - next + + next - - - - - ps/blame + + + + + ps/blame - - - C1 - - - - - C2 - - - - - - - - - - - - - C3 - - - - C5 - - - - C7 - - - - C9 - - - - C11 - - - + + + C1 + + + + + C2 + + + + + + + + + + + + C3 + + + + C5 + + + + C7 + + + + C9 + + + + C11 + + + - - C4 + + C4 - - - - C16 - - - - - C17 - - - - - C13 - - - - - C14 - - - - - C15 - - - + + + + C16 + + + + + C17 + + + + + C13 + + + + + C14 + + + + + C15 + + + - - C6 + + C6 - - + + - - C8 + + C8 - - + + - - C10 + + C10 - - + + - - C12 + + C12 - + + diff --git a/images/lr-branches-1.svg b/images/lr-branches-1.svg index b45e12fe1..ad050292b 100644 --- a/images/lr-branches-1.svg +++ b/images/lr-branches-1.svg @@ -1,77 +1,72 @@ - - - - images/lr-branches-1 - Created with Sketch. - - - - - C1 - - - - - - - C2 - - - - - - - C3 - - - - - - - C4 - - - - - - - C5 - - - - - - - C6 - - - - - - - C7 - - - - - - - master - - - - - - - develop - - - - - - - topic - - - + + + + + + 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/managed-team-1.svg b/images/managed-team-1.svg index 35623a146..12bffd398 100644 --- a/images/managed-team-1.svg +++ b/images/managed-team-1.svg @@ -1,71 +1,56 @@ - - - - images/managed-team-1 - Created with Sketch. - - - - - 4b078 - - - - - - - 1edee - - - - - - - - 33009 - - - - - - - - 85127 - - - - - - - e5b0f - - - - - - - - featureB - - - - - - - - - master - - - - - - - - - featureA - - - - + + + + + + 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.svg b/images/managed-team-2.svg index 25362d43f..7318ac6ab 100644 --- a/images/managed-team-2.svg +++ b/images/managed-team-2.svg @@ -1,5 +1,5 @@ - + @@ -12,98 +12,98 @@ images/managed-team-2 Created with Sketch. - - - + + + 4b078 - - + + 1edee - + 33009 - + aad88 - + 774b3 - + 85127 - - + + cd685 - - + + fba9a - - + + e5b0f - - - + + + - + - - - origin/ featureBee - - - - featureB + + + featureB - - - - - master + + + + + master - - - + + + - - - - - origin/ featureA + - - - featureA + + + featureA + + + origin/featureA + + + + origin/featureBee + diff --git a/images/managed-team-3.svg b/images/managed-team-3.svg index 931aa1b1f..bb65880d9 100644 --- a/images/managed-team-3.svg +++ b/images/managed-team-3.svg @@ -1,150 +1,116 @@ - - - - images/managed-team-3 - Created with Sketch. - - - - - - - 4b078 - - - - - - - 1edee - - - - - - - - 33009 - - - - - - - - - aad88 - - - - - - - - - 774b3 - - - - - - - - 5399e - - - - - - - - 85127 - - - - - - - - cd685 - - - - - - - fba9a - - - - - - - e5b0f - - - - - - - - - - origin/ - featureBee - - - - - - - - - featureB - - - - - - - - - master - - - - - - - - - - - origin/ - featureA - - - - - - - - - - - origin/ - master - - - - - - - - - featureA - - - - + + + + + + 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.svg b/images/managed-team-flow.svg index 640dfbe13..a49db4ce6 100644 --- a/images/managed-team-flow.svg +++ b/images/managed-team-flow.svg @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ images/managed-team-flow Created with Sketch. - + Josie @@ -41,23 +41,7 @@ Jessica - - - server: featureA - - - - server: featureA - - - - server: featureBee - - - - server: featureBee - git commit (A) git commit (B) @@ -90,5 +74,21 @@ git merge (A) + + + server:featureA + + + + server:featureBee + + + + server:featureA + + + + server:featureBee + diff --git a/images/merging-workflows-1.svg b/images/merging-workflows-1.svg index bb4ea74aa..622cb69b1 100644 --- a/images/merging-workflows-1.svg +++ b/images/merging-workflows-1.svg @@ -1,95 +1,84 @@ - - - - images/merging-workflows-1 - Created with Sketch. - - - - - - C1 - - - - - - - - - C2 - - - - - - - - C7 - - - - - - - - C3 - - - - - - - - - C4 - - - - - - - - - C5 - - - - - - - - - C6 - - - - - - - - - master - - - - - - - - - ruby_client - - - - - - - - - php_client - - - - + + + + + + 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.svg b/images/merging-workflows-2.svg index 52ba86dfd..a96571cea 100644 --- a/images/merging-workflows-2.svg +++ b/images/merging-workflows-2.svg @@ -1,111 +1,100 @@ - - - - images/merging-workflows-2 - Created with Sketch. - - - - - - C1 - - - - - - - - - C2 - - - - - - - - C7 - - - - - - - - C3 - - - - - - - - - C4 - - - - - - - - - C9 - - - - - - - - - C8 - - - - - - - - - C5 - - - - - - - - C6 - - - - - - - - master - - - - - - - - - ruby_client - - - - - - - - - php_client - - - - + + + + + + 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.svg b/images/merging-workflows-3.svg index 41fb32e0d..4d96149ba 100644 --- a/images/merging-workflows-3.svg +++ b/images/merging-workflows-3.svg @@ -1,73 +1,66 @@ - - - - images/merging-workflows-3 - Created with Sketch. - - - - - - C1 - - - - - - - - C2 - - - - - - - C5 - - - - - - - - C3 - - - - - - - - C4 - - - - - - - - develop - - - - - - - - - master - - - - - - - - - ruby_client - - - - + + + + + + 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.svg b/images/merging-workflows-4.svg index 45e6e3545..03d27b90d 100644 --- a/images/merging-workflows-4.svg +++ b/images/merging-workflows-4.svg @@ -1,83 +1,74 @@ - - - - images/merging-workflows-4 - Created with Sketch. - - - - - - C1 - - - - - - - - C2 - - - - - - - C5 - - - - - - - - C3 - - - - - - - - - C4 - - - - - - - - - C6 - - - - - - - - develop - - - - - - - - - master - - - - - - - - - ruby_client - - - - + + + + + + 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.svg b/images/merging-workflows-5.svg index 3c40d5711..d817f71e1 100644 --- a/images/merging-workflows-5.svg +++ b/images/merging-workflows-5.svg @@ -1,83 +1,74 @@ - - - - images/merging-workflows-5 - Created with Sketch. - - - - - - C1 - - - - - - - - C2 - - - - - - - C5 - - - - - - - - C3 - - - - - - - - - C4 - - - - - - - - - C6 - - - - - - - - develop - - - - - - - - - master - - - - - - - - - ruby_client - - - - + + + + + + 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/perils-of-rebasing-1.svg b/images/perils-of-rebasing-1.svg index b960e6062..ee813308e 100644 --- a/images/perils-of-rebasing-1.svg +++ b/images/perils-of-rebasing-1.svg @@ -12,47 +12,49 @@ images/perils-of-rebasing-1 Created with Sketch. - - - - - - C1 + + + + + + C1 - - - - master + + + + + master + - - - C1 + + + C1 - - - - C2 + + + + C2 - - - - C3 + + + + C3 - - - - - master + + + + + master - - - - - teamone/master + + + + + teamone/master - My Computer - git.team1.ourcompany.com + My Computer + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-2.svg b/images/perils-of-rebasing-2.svg index b5dc69fc5..210dd4958 100644 --- a/images/perils-of-rebasing-2.svg +++ b/images/perils-of-rebasing-2.svg @@ -1,5 +1,5 @@ - + @@ -12,99 +12,95 @@ images/perils-of-rebasing-2 Created with Sketch. - - - - - - - C1 - - - - - - master + + + + + + + C1 + + + + master + + + + C4 + + + + + + C5 + + + + + C6 - - - C1 - - - - - C2 - - - - + My Computer + git.team1.ourcompany.com + + + + C1 + + + C3 - - - - - - C7 + + + + + + C7 + - - - - - - C4 + + + + + C4 + - - - - - - C5 - - - - - - C6 + + + + + + C5 + - - - - - - C4 + + + + + C6 + - - - - - - C5 - - - - - - C6 + + + - - - - - - master + master + + + + + teamone/master + - - - - - - teamone/master + + + + + C2 + - My Computer - git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-3.svg b/images/perils-of-rebasing-3.svg index a04edd033..1ad6f7da0 100644 --- a/images/perils-of-rebasing-3.svg +++ b/images/perils-of-rebasing-3.svg @@ -1,5 +1,5 @@ - + @@ -12,115 +12,127 @@ images/perils-of-rebasing-3 Created with Sketch. - - - - - - - C1 - - - - - - master - - - - - C1 - - - - - C2 - - - - - - C3 - - - - - - - C7 - - - - - - - C4' - - - - - - - C4' - - - - - - C5 - - - - - - - C4 + + + + + + + + C1 - - - - - - - C6 + + + + + master + + + + + + C4' + + + + + + C5 + + + + + + + + C4 + + + + + + + + C6 + + - - - - - - C4 - - - - - - - C5 - - - - - - C6 - - - - - - - master - - - - - - - teamone/master + + + + C1 + + + + + + C2 + + + + + + + C3 + + + + + + + + C7 + + + + + + + C4' + + + + + + + C4 + + + + + + + C5 + + + + + + + + + C6 + + + + + + + + master + + + + + + + teamone/master + + + My Computer + git.team1.ourcompany.com - My Computer - git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-4.svg b/images/perils-of-rebasing-4.svg index 2d127dc7a..f4d24b7f9 100644 --- a/images/perils-of-rebasing-4.svg +++ b/images/perils-of-rebasing-4.svg @@ -1,5 +1,5 @@ - + @@ -12,123 +12,133 @@ images/perils-of-rebasing-4 Created with Sketch. - - - - - - - - C1 - - - - - - master + + + + + + + C1 - - - - C1 - - - - - C2 - - - - - - C3 + + + + master - - - - - - C7 + + + + + C4' + - - - - - - C8 + + - - - - - - C4' + + + C5 - - - - - - C4' + + + + + + C4 + + + + + + + + C6 + + - - - - C5 - - - - - - - C4 + + + + C1 + + + + + + C2 - - - - - - C6 + + + + + C3 - - - - - - C4 + + + + + + C7 + - - - - - - C5 - - - - - - C6 + + + + + + C8 + - - - - - - master + + + + + C4' + - - - - - - teamone/master + + + + + C4 + + + + + + + + C5 + + + + + + + C6 + + + + + + + master + + + + + + + + + teamone/master + - My Computer - git.team1.ourcompany.com + My Computer + git.team1.ourcompany.com diff --git a/images/perils-of-rebasing-5.svg b/images/perils-of-rebasing-5.svg index f38cbd6fd..fcdf683f4 100644 --- a/images/perils-of-rebasing-5.svg +++ b/images/perils-of-rebasing-5.svg @@ -1,5 +1,5 @@ - + @@ -12,90 +12,100 @@ images/perils-of-rebasing-5 Created with Sketch. - - - - + + + + C1 - - - + + + master - - - C1 - - - - + + + C4' - - - - - C4' - - - - - C2' - - - - - C3' + + + + + C5 - - - - C5 - - - - - + + + + C4 - - - - + + + + C6 - - - - C5 + + + + + + C1 - - - - - master + + + + + C4' - - - - - teamone/master + + + + + + + C2' - My Computer - git.team1.ourcompany.com + + + + + C3' + + + + + + + C5 + + + + + + + master + + + + + teamone/master + + My Computer + git.team1.ourcompany.com diff --git a/images/public-small-1.svg b/images/public-small-1.svg index 994a324e5..b93842285 100644 --- a/images/public-small-1.svg +++ b/images/public-small-1.svg @@ -1,92 +1,82 @@ - - - - images/public-small-1 - Created with Sketch. - - - - - 4b078 - - - - - - - 1edee - - - - - - - - 33009 - - - - - - - - - 0d708 - - - - - - - - e5b0f - - - - - - - a2de3 - - - - - - - - master - - - - - - - - - - - origin/ - master - - - - - - - - - featureA - - - - - - - - - featureB - - - - + + + + + + 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.svg b/images/public-small-2.svg index 814245209..d1aa124c5 100644 --- a/images/public-small-2.svg +++ b/images/public-small-2.svg @@ -1,92 +1,76 @@ - - - - images/public-small-2 - Created with Sketch. - - - - - 4b078 - - - - - - - 1edee - - - - - - - - 33009 - - - - - - - - - 5399e - - - - - - - - e5b0f - - - - - - - dee6b - - - - - - - - master - - - - - - - - - - - origin/ - master - - - - - - - - - featureA - - - - - - - - - featureB - - - - + + + + + + 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.svg b/images/public-small-3.svg index ec03c5382..2f31fcc76 100644 --- a/images/public-small-3.svg +++ b/images/public-small-3.svg @@ -1,110 +1,108 @@ - - - - images/public-small-3 - Created with Sketch. - - - - - 4b078 - - - - - - - 1edee - - - - - - - - 33009 - - - - - - - - - 5399e - - - - - - - - - 17f4d - - - - - - - - e5b0f - - - - - - - dee6b - - - - - - - - master - - - - - - - - - - - origin/ - master - - - - - - - - - featureA - - - - - - - - - featureB - - - - - - - - - featureBv2 - - - + + + + + + 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.svg b/images/rebasing-1.svg index 67de0119d..85d75a475 100644 --- a/images/rebasing-1.svg +++ b/images/rebasing-1.svg @@ -1,64 +1,57 @@ - - - - images/rebasing-1 - Created with Sketch. - - - - - - 0b743 - - - - - - - - a6b4c - - - - - - - f42c5 - - - - - - - - e43a6 - - - - - - - - 5ddae - - - - - - - - master - - - - - - - - - ruby_client - - - - + + + + + + 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.svg b/images/rebasing-2.svg index 1daf4c159..087b845f7 100644 --- a/images/rebasing-2.svg +++ b/images/rebasing-2.svg @@ -1,76 +1,71 @@ - - - - images/rebasing-2 - Created with Sketch. - - - - - - 0b743 - - - - - - - - a6b4c - - - - - - - - f42c5 - - - - - - - - a0a41 - - - - - - - - master - - - - - - - - - - - - e43a6 - - - - - - - 5ddae - - - - - - - - ruby_client - - - - + + + + + + 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.svg b/images/remote-branches-1.svg index 955407610..1e466427b 100644 --- a/images/remote-branches-1.svg +++ b/images/remote-branches-1.svg @@ -12,65 +12,67 @@ images/remote-branches-1 Created with Sketch. - - - - - - - - - 0b743 - - - - - a6b4c - - - - - - f4265 - - - - master - - - git.ourcompany.com + + + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + + master + + + git.ourcompany.com + git clone janedoe@git.ourcompany.com:project.git + + + + 0b743 + + + + + + a6b4c - git clone janedoe@git.ourcompany.com:project.git - - - - - - 0b743 - - - - - a6b4c - - - - - - f4265 - - - - master - - - - origin/master - - My Computer - Remote branch - Local branch + + + + + + f4265 + + + + + + + master + + + + + + + origin/master + My Computer + Remote branch + Local branch diff --git a/images/remote-branches-2.svg b/images/remote-branches-2.svg index da7808b0c..b76e0fc90 100644 --- a/images/remote-branches-2.svg +++ b/images/remote-branches-2.svg @@ -1,5 +1,5 @@ - + @@ -12,80 +12,84 @@ images/remote-branches-2 Created with Sketch. - - - - 0b743 - - - - - a6b4c - - - - - f4265 - - - - - 31b8e - - - - - 190a3 - - - - - - master + + + + + 0b743 - - - - - 0b743 - - - - - a6b4c - - - - - f4265 - - - - - a38de - - - - - 893cf - - - - - - master + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master + - - - origin/master - - - - - My Computer - git.ourcompany.com + + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + a38de + + + + + 893cf + + + + + + master + + + + + + + origin/master + + - Someone else pushes + + + My Computer + git.ourcompany.com + Someone else pushes diff --git a/images/remote-branches-3.svg b/images/remote-branches-3.svg index 2e74423f8..452ae2249 100644 --- a/images/remote-branches-3.svg +++ b/images/remote-branches-3.svg @@ -12,97 +12,93 @@ images/remote-branches-3 Created with Sketch. - - - - - 0b743 - - - - - a6b4c - - - - - - f4265 - - - - - - - 31b8e - - - - - 190a3 - - - - a38de - - - - - 893cf - - - - - - master - - - - - - - origin/master - - - - My Computer + + + + 0b743 - - - - 0b743 - - - - - a6b4c - - - - - f4265 + + + + a6b4c + + + + + + f4265 - - - - 31b8e + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + + master - - - - 190a3 + + + + + + origin/master - - - - - master - + + + My Computer + + + 0b743 + + + + + a6b4c + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master - - git.ourcompany.com - git fetch origin - + + git.ourcompany.com + git fetch origin + diff --git a/images/remote-branches-4.svg b/images/remote-branches-4.svg index 5f1871709..8b7bd0cbc 100644 --- a/images/remote-branches-4.svg +++ b/images/remote-branches-4.svg @@ -1,5 +1,5 @@ - + @@ -12,108 +12,102 @@ 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 + + + + 0b743 + + + + + a6b4c + + + + + + f4265 - - - - 190a3 + + + + + + 31b8e + + + + + 190a3 + + + + a38de + + + + + 893cf + + + + + master + + + + + + origin/master - - - - - master - + + + My Computer + git remote add teamone git://git.team1.ourcompany.com + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master - - git.ourcompany.com - origin - - - - f4265 - - - - - 31b8e - - - - - - master + + git.ourcompany.com + origin + + + + f4265 + + + + + 31b8e + + + + + + master - - git.team1.ourcompany.com - teamone + + git.team1.ourcompany.com + teamone diff --git a/images/remote-branches-5.svg b/images/remote-branches-5.svg index c3a2d3a0f..0ba0a0473 100644 --- a/images/remote-branches-5.svg +++ b/images/remote-branches-5.svg @@ -12,120 +12,116 @@ images/remote-branches-5 Created with Sketch. - - - - + + + + 0b743 - - + + a6b4c - + f4265 - - - + + + 31b8e - - + + 190a3 - + a38de - - + + 893cf - - - - - master + + + + + master - - - - - origin/master + + + + + origin/master - - - - - teamone/master - + + + + teamone/master - - My Computer - git fetch teamone - - - - - - f4265 - - - - - 31b8e - - - - - 190a3 - - - - - - master - + + My Computer + git fetch teamone + + + + + f4265 + + + + + 31b8e + + + + + 190a3 + + + + + + master - - git.ourcompany.com - origin - - - + + git.ourcompany.com + origin + + + f4265 - - + + 31b8e - - - - - master + + + + + master - - git.team1.ourcompany.com - teamone + + git.team1.ourcompany.com + teamone diff --git a/images/replace1.svg b/images/replace1.svg index b4cfb1fe3..7475392db 100644 --- a/images/replace1.svg +++ b/images/replace1.svg @@ -1,64 +1,53 @@ - - - - images/replace1 - Created with Sketch. - - - - - - - ef989 - - - - fifth - - - - - c6e1e - - - - fourth - - - - - - 9c68f - - - - third - - - - - - 94570 - - - - second - - - - - - c1822 - - - - first - - - - - master - - - + + + + + + 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.svg b/images/replace2.svg index b386fffd9..30410b0e1 100644 --- a/images/replace2.svg +++ b/images/replace2.svg @@ -1,71 +1,64 @@ - - - - images/replace2 - Created with Sketch. - - - - - - - ef989 - - - - fifth - - - - - c6e1e - - - - fourth - - - - - - 9c68f - - - - third - - - - - - 94570 - - - - second - - - - - - c1822 - - - - first - - - - - master - - - - - - - history - - - + + + + + + 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.svg b/images/replace3.svg index a81a61fe3..193ac7980 100644 --- a/images/replace3.svg +++ b/images/replace3.svg @@ -1,73 +1,73 @@ - - - - images/replace3 - Created with Sketch. - - - - - - ef989 - - - - fifth - - - - - c6e1e - - - - fourth - - - - - - 9c68f - - - - third - - - - - - 94570 - - - - second - - - - - - c1822 - - - - - - 622e8 - - - - first - - - instructions - - - - - - history - - + + + + + + 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.svg b/images/replace4.svg index 4bdeec1ae..9181110f7 100644 --- a/images/replace4.svg +++ b/images/replace4.svg @@ -1,5 +1,5 @@ - + @@ -12,72 +12,84 @@ images/replace4 Created with Sketch. - - - - - - - - - ef989 + + + + + + + rebase + - fifth - - - - c6e1e - - fourth - - - - - 9c68f - - third - - - e146b - - fifth - - - - 81a70 - - fourth - - - - 94570 - - second - - - - c1822 - - - - 622e8 - - first - instructions - - - - history - - - - - master - - - rebase - + + + + + ef989 + fifth + + + + + + + master + + + + + + + e146b + fifth + + + + + c6e1e + fourth + + + + + + + history + + + + + + + 81a70 + fourth + + + + + 622e8 + instructions + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + diff --git a/images/replace5.svg b/images/replace5.svg index c93347211..dae52b664 100644 --- a/images/replace5.svg +++ b/images/replace5.svg @@ -1,5 +1,5 @@ - + @@ -12,58 +12,78 @@ images/replace5 Created with Sketch. - - - - - e146b - - fifth - - - replace - - - 81a70 - - fourth - - - - - 622e8 - - - - c6e1e - - instructions - - - 9c68f - - - - 94570 - - second - - - - - - master - - - - c1822 - - fourth - third - first - - - history + + + + + + + master + + + + + + + e146b + fifth + + + + + replace + + + + + + + 81a70 + fourth + + + + + 622e8 + instructions + + + + + + + + c6e1e + fourth + + + + + + + history + + + + + + + 9c68f + third + + + + + + 94570 + second + + + + c1822 + first + + diff --git a/images/rerere1.svg b/images/rerere1.svg index 13f93ca0e..19b597d8c 100644 --- a/images/rerere1.svg +++ b/images/rerere1.svg @@ -1,5 +1,5 @@ - + @@ -12,31 +12,41 @@ images/rerere1 Created with Sketch. - - - - - - - - master + + + + + + master + - - - hello world + + + + + hello world + - - - hola world + + + + + hola world + - - - hello mundo + + + + + hello mundo + - - - - i18-world + + + + + i18-world + diff --git a/images/rerere2.svg b/images/rerere2.svg index fceb43765..041e26850 100644 --- a/images/rerere2.svg +++ b/images/rerere2.svg @@ -1,5 +1,5 @@ - + @@ -12,46 +12,60 @@ images/rerere2 Created with Sketch. - - - - - - - - - - master - - - - hello world - - - - hola world - - - - hola mundo - - - - hello mundo - - - - - i18-world - - - - - rerere cache - - - - - puts ‘hola world’ - puts ‘hello mundo’ ++ puts ‘hola mundo’ + + + + + + + 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.svg b/images/rerere3.svg index 5a39b190e..61bd3427c 100644 --- a/images/rerere3.svg +++ b/images/rerere3.svg @@ -1,5 +1,5 @@ - + @@ -14,45 +14,110 @@ Created with Sketch. - + - - - - - - - - - master - - - - hello world - - - - hola world - - - - hola mundo - - - - + diff --git a/images/reset-checkout.svg b/images/reset-checkout.svg index c9851b4fc..c7f619e5c 100644 --- a/images/reset-checkout.svg +++ b/images/reset-checkout.svg @@ -1,5 +1,5 @@ - + @@ -12,111 +12,105 @@ images/reset-checkout Created with Sketch. - - - - - - commit A - - - - - commit B - - - - - - master - + + before command + + + commit A + + + + + commit B + + + + + master - - - - - develop - + + + + + + develop - - - - - HEAD - + + + + + + HEAD - before command - - - - - commit A - - - - - commit B + + + + commit A + + + + + + commit B - - - - - master - + + + + + + HEAD - - - - - develop - + + + + + + master - - - - - HEAD - + + + + + + develop - after reset - - - - after checkout - - - - commit A - - - - - commit B - - - - - - master - + after reset + + + after checkout + + + + commit A + + + + + commit B + + + + + + master - - - - - develop - + + + + + + develop - - - - - HEAD - + + + + + + HEAD diff --git a/images/small-team-1.svg b/images/small-team-1.svg index 193b48515..e33ae1b18 100644 --- a/images/small-team-1.svg +++ b/images/small-team-1.svg @@ -1,5 +1,5 @@ - + @@ -12,42 +12,44 @@ images/small-team-1 Created with Sketch. - - - - 4b078 + + + + 4b078 - - + + - - 1edee + + 1edee - - - - - 738ee + + + + + 738ee - - - - fbff5 + + + + + fbff5 + - - - - - origin/master + + + + + origin/master - - - - - master + + + + + master diff --git a/images/small-team-2.svg b/images/small-team-2.svg index 5c7037ee4..78e7d23a9 100644 --- a/images/small-team-2.svg +++ b/images/small-team-2.svg @@ -1,65 +1,64 @@ - - - - images/small-team-2 - Created with Sketch. - - - - - 4b078 - - - - - - - - 1edee - - - - - - - - - 738ee - - - - - - - - - 72bbc - - - - - - - fbff5 - - - - - - - - origin/master - - - - - - - - - master - - - - + + + + + + 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.svg b/images/small-team-3.svg index f6e888bfc..1a2dbd429 100644 --- a/images/small-team-3.svg +++ b/images/small-team-3.svg @@ -1,67 +1,64 @@ - - - - images/small-team-3 - Created with Sketch. - - - - - 4b078 - - - - - - - - 1edee - - - - - - - - - 738ee - - - - - - - - - 72bbc - - - - - - - fbff5 - - - - - - - - - origin/master - - - - - - - - - - master - - - - + + + + + + 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.svg b/images/small-team-4.svg index 795a3569f..3cd495ed3 100644 --- a/images/small-team-4.svg +++ b/images/small-team-4.svg @@ -1,84 +1,75 @@ - - - - images/small-team-4 - Created with Sketch. - - - - - 4b078 - - - - - - - - 1edee - - - - - - - - - fbff5 - - - - - - - - - 8149a - - - - - - - - - 23ac6 - - - - - - - - 4af42 - - - - - - - - origin/master - - - - - - - - - master - - - - - - - - - issue54 - - - - + + + + + + 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.svg b/images/small-team-5.svg index 4c05449d8..8279e6825 100644 --- a/images/small-team-5.svg +++ b/images/small-team-5.svg @@ -1,101 +1,90 @@ - - - - images/small-team-5 - Created with Sketch. - - - - - 4b078 - - - - - - - - 1edee - - - - - - - - - fbff5 - - - - - - - - - 738ee - - - - - - - - - 72bbc - - - - - - - - 8149a - - - - - - - - - 23ac6 - - - - - - - - 4af42 - - - - - - - - origin/master - - - - - - - - - master - - - - - - - - - issue54 - - - - + + + + + + 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.svg b/images/small-team-6.svg index 005eb0bd8..0c0804b79 100644 --- a/images/small-team-6.svg +++ b/images/small-team-6.svg @@ -1,109 +1,100 @@ - - - - images/small-team-6 - Created with Sketch. - - - - - 4b078 - - - - - - - - 1edee - - - - - - - - - fbff5 - - - - - - - - - 738ee - - - - - - - - - 72bbc - - - - - - - - 8059c - - - - - - - - 8149a - - - - - - - - - 23ac6 - - - - - - - - 4af42 - - - - - - - - origin/master - - - - - - - - - master - - - - - - - - - issue54 - - - - + + + + + + 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.svg b/images/small-team-7.svg index 74b50c7d5..726076274 100644 --- a/images/small-team-7.svg +++ b/images/small-team-7.svg @@ -1,109 +1,100 @@ - - - - images/small-team-7 - Created with Sketch. - - - - - 4b078 - - - - - - - - 1edee - - - - - - - - - fbff5 - - - - - - - - - 738ee - - - - - - - - - 72bbc - - - - - - - - 8059c - - - - - - - - 8149a - - - - - - - - - 23ac6 - - - - - - - - 4af42 - - - - - - - - origin/master - - - - - - - - - master - - - - - - - - - issue54 - - - - + + + + + + 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.svg b/images/small-team-flow.svg index 4129892b4..e8669b5d3 100644 --- a/images/small-team-flow.svg +++ b/images/small-team-flow.svg @@ -1,95 +1,68 @@ - - - - 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 - - - + + + + + + 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/topic-branches-1.svg b/images/topic-branches-1.svg index 09afb608c..f181fbfa7 100644 --- a/images/topic-branches-1.svg +++ b/images/topic-branches-1.svg @@ -1,5 +1,5 @@ - + @@ -12,91 +12,91 @@ 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 - + + + + 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.svg b/images/topic-branches-2.svg index 3e29218f7..a17db5e4f 100644 --- a/images/topic-branches-2.svg +++ b/images/topic-branches-2.svg @@ -1,5 +1,5 @@ - + @@ -12,83 +12,107 @@ images/topic-branches-2 Created with Sketch. - - - - C0 - - - - - C1 - - - - - C3 - - - - - C9 - - - - - C10 - - - - - C2 - - - - - C4 - - - - - C13 - - - - - - C14 - - - - - C12 - - - - master - - - - - C7 - - - - - C8 - - - - - C11 - - + + + + C0 + + + + + + C1 + + + + + + + C3 + + + + + + + C9 + + + + + + + C10 + + + + + + + C2 + + + + + + + C4 + + + + + + + C13 + + + + + + + + C14 + + + + + + + C12 + + + + + master + + + + + + C7 + + + + + + + C8 + + + + + + + C11 + + + iss91v2 - - - dumbidea + + + dumbidea diff --git a/images/two-branches.svg b/images/two-branches.svg index 80c30fdf3..ded4572cf 100644 --- a/images/two-branches.svg +++ b/images/two-branches.svg @@ -12,32 +12,40 @@ images/two-branches Created with Sketch. - - - - - - - + + + + master - + + + + testing - + + + + f30ab - + + + + + + 34ac2 - - - 98ca9 - + + + + 98ca9