Created
July 9, 2013 23:35
-
-
Save thorncp/5962258 to your computer and use it in GitHub Desktop.
git-merge: fast forward vs no fast forward
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| after fast forward merge | |
| git merge feature-branch | |
| . feature commit - master/feature-branch/HEAD | |
| . feature commit | |
| . feature commit | |
| . master commit | |
| . master commit | |
| after no fast forward merge | |
| git merge --no-ff feature-branch | |
| . generated merge commit - master/HEAD | |
| |\ | |
| | . feature commit - feature-branch | |
| | . feature commit | |
| | . feature commit | |
| |/ | |
| . master commit | |
| . master commit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment