Changes between Version 8 and Version 9 of WorkingWithGit

Timestamp:

Aug 20, 2016, 8:57:10 PM (8 years ago)

Author:

neverpanic (Clemens Lang)

Comment:

Add attachment link

WorkingWithGit

@@ -103 +103 @@
                +--- L1 ---- L2 ------ M  <= master
 }}}
-The new commit M is the merge commit and can be pushed back to origin. This preserves the information that work was done in parallel, but unfortunately tends to mess up the history graph. See the attached screenshot of a commit history that always merges. To avoid this, you can instead rebase your changes.
+The new commit M is the merge commit and can be pushed back to origin. This preserves the information that work was done in parallel, but unfortunately tends to mess up the history graph. See the [raw-attachment:commit-history-with-excessive-merging.png attached screenshot] of a commit history that always merges. To avoid this, you can instead rebase your changes.
 
 ===== Rebasing =====