Figuri și tabele

Figure 9 p. 70 A commit and its tree CommitTree objectAuthorBlobCommitter Figure 10 p. 70 Commits and their parents CommitParent commitAuthorCommitterSnapshot+1 Figure 11 p. 71 A branch and its commit history BranchCommit history Figure 12 p. 71 Two branches pointing into the same series of commits BranchCommit Figure 13 p. 72 HEAD pointing to a branch BranchHEAD Figure 14 p. 73 HEAD points to the current branch HEADBranch Figure 15 p. 73 The HEAD branch moves forward when a commit is made BranchCommitHEAD Figure 16 p. 74 HEAD moves when you checkout HEADgit checkoutmaster Figure 17 p. 75 Divergent history Divergent history Figure 18 p. 76 A simple commit history Commit history Figure 19 p. 77 Creating a new branch pointer Branch Figure 20 p. 78 The iss53 branch has moved forward with your work Branch Figure 21 p. 79 Hotfix branch based on master Branchmaster Figure 22 p. 80 master is fast-forwarded to hotfix masterFast-forward Figure 23 p. 81 Work continues on iss53 Figure 24 p. 82 Three snapshots used in a typical merge MergeSnapshotCommon ancestor Figure 25 p. 82 A merge commit Merge commit Figure 26 p. 89 A linear view of progressive-stability branching Branching Figure 27 p. 89 A “silo” view of progressive-stability branching Branchingmaster Figure 28 p. 90 Multiple topic branches Topic branch Figure 29 p. 91 History after merging dumbidea and iss91v2 Commit historyMerge Figure 30 p. 93 Server and local repositories after cloning git cloneRepositoryBranchmasterorigin+1 Figure 31 p. 94 Local and remote work can diverge Divergent historyRemote repositorygit pushmasterorigin Figure 32 p. 95 git fetch updates your remote-tracking branches git fetchRemote-tracking branchmasterorigin Figure 33 p. 96 Adding another server as a remote Remote repositorygit remotemasterorigin Figure 34 p. 97 Remote-tracking branch for teamone/master masterRemote-tracking branchgit fetchorigin Figure 35 p. 101 Simple divergent history Divergent history Figure 36 p. 102 Merging to integrate diverged work history Commit historyDivergent historyMerge Figure 37 p. 102 Rebasing the change introduced in C4 onto C3 Rebase Figure 38 p. 103 Fast-forwarding the master branch Fast-forwardmaster Figure 39 p. 104 A history with a topic branch off another topic branch Topic branchCommit history Figure 40 p. 104 Rebasing a topic branch off another topic branch Topic branchRebase Figure 41 p. 105 Fast-forwarding your master branch to include the client branch changes BranchFast-forwardmaster Figure 42 p. 105 Rebasing your server branch on top of your master branch BranchmasterRebase Figure 43 p. 106 Final commit history Commit history Figure 44 p. 106 Clone a repository, and base some work on it git cloneRepository Figure 45 p. 107 Fetch more commits, and merge them into your work Commitgit fetchMerge Figure 46 p. 107 Someone pushes rebased commits, abandoning commits you’ve based your work on Commitgit pushRebase Figure 47 p. 108 You merge in the same work again into a new merge commit MergeMerge commit Figure 48 p. 109 Rebase on top of force-pushed rebase work RebaseForce push