Skip to content

Instantly share code, notes, and snippets.

@BenBergman
Created January 24, 2014 20:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save BenBergman/8605367 to your computer and use it in GitHub Desktop.
Save BenBergman/8605367 to your computer and use it in GitHub Desktop.
●─┐ Commit P - Merge O into N
│ ● Commit O after M
●─│─┐ Commit N - Merge M into L
│ ●─┘ Commit M after K
●─│─┐ Commit L - Merge K into J
│ ●─┘ Commit K - Merge J into E
●─│─┐ Commit J - Merge F into I
●─│─│─┐ Commit I - Merge H into C
│ │ │ ● Commit H after G
│ │ ● │ Commit F after C
│ ● │ │ Commit E after D
●─│─┐ │ Commit C - Merge B into A
│ ● │ │ Commit D after Q
│ │ ● │ Commit B after R
│ │ ● │ Commit R after A
│ ● │ │ Commit Q after X
●─│─┐ │ Commit A - Merge T into S
│ │ ● │ Commit T after U
│ │ ● │ Commit U after V
│ │ ● │ Commit V after W
`git log --graph`-like output
=============================
| | * | Commit F after C
| * | | Commit E after D
| |/ /
|/| /
* | | Commit C - Merge B into A
|\| \
| |\ \
| * | | Commit D after Q
| | * | Commit B after R
Option 1
========
│ │ ● │ Commit F after C
│ ● │ │ Commit E after D
●─│─┘─│─┐ Commit C - Merge B into A
│ ● ┌─│─┘ Commit D after Q
│ │ ● │ Commit B after R
Option 2
========
│ │ ● │ | | * | Commit F after C
│ ● │ │ | * | | Commit E after D
●─│═╡ │ *-|-< | Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ ● │ | | * | Commit B after R
Option 3
========
│ │ ● │ | | * | Commit F after C
│ ● │ │ | * | | Commit E after D
●─│─〈 │ *-|-< | Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ ● │ | | * | Commit B after R
Option 4
========
│ │ ● │ | | * | Commit F after C
│ ● │ │ | * | | Commit E after D
●─│╮╯ │ *-|-< | Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ ● │ | | * | Commit B after R
Option 5
========
│ │ ● │ | | * | Commit F after C
│ ● │ │ | * | | Commit E after D
●─│─┤ │ *-|-< | Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ ● │ | | * | Commit B after R
Option 6
========
│ │ ● │ | | * | Commit F after C
│ ● │ │ | * | | Commit E after D
●─│─< │ *-|-< | Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ ● │ | | * | Commit B after R
Option 7
========
│৴│─● │ |,|-* | Commit F after C
│ ● │ | * | Commit E after D
●─│─┐ │ *-|-. | Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ ● │ | | * | Commit B after R
Option 8
========
│─│─● │ |,|-* | Commit F after C
│ ● ┌─┘ | * .-' Commit E after D
●─│─│─┐ *-|-|-. Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ │ ● | | | * Commit B after R
Option 9
========
├─│─● │ |,|-* | Commit F after C
│ ● ┌─┘ | * .-' Commit E after D
●─│─│─┐ *-|-|-. Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ │ ● | | | * Commit B after R
Option 10
=========
┟─│─● │ |,|-* | Commit F after C
│ ● ┌─┘ | * .-' Commit E after D
●─│─│─┐ *-|-|-. Commit C - Merge B into A
│ ● │ │ | * | | Commit D after Q
│ │ │ ● | | | * Commit B after R
Option 11
=========
│ │ ● │ Commit F after C
│ ● │ │ Commit E after D
├─│─┘ │
●─│─┐ │ Commit C - Merge B into A
│ ● │ │ Commit D after Q
│ │ ● │ Commit B after R
@MattWoelk
Copy link

│,│─●   Commit F after C
│ ●     Commit E after D
●─│─.   Commit C - Merge B into A
│ ● │   Commit D after Q
│ │ ●   Commit B after R

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment