Skip to content

Instantly share code, notes, and snippets.

@frozenspider
Last active August 29, 2015 14:06
Show Gist options
  • Save frozenspider/6ff15c7f7b42b6991e70 to your computer and use it in GitHub Desktop.
Save frozenspider/6ff15c7f7b42b6991e70 to your computer and use it in GitHub Desktop.
Merge and rebase history
Merge:
z
|\
| g
x | |
| * |
| | f
| * |
| * |
* | |
| * |
| | e
| | d
| | c
| | b
| | a
| |/
| 0
| |
Rebase:
z
|\
| g
| f
| e
| d
| c
| b
| a
x |/
| *
| *
| *
* |
| *
| 0
| |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment