Created
June 25, 2014 13:33
-
-
Save jdudek/8c63abd5054d9a1db9e2 to your computer and use it in GitHub Desktop.
This file contains 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
| ~/tmp/git-example (master) $ git log | |
| fc8f07f 2014-06-25 15:25:14 +0200 | A (HEAD, master) [Jan Dudek] | |
| 530ef46 2014-06-25 15:08:41 +0200 | initial commit [Jan Dudek] | |
| ~/tmp/git-example (master) $ git log b | |
| 86c2a22 2014-06-25 15:25:49 +0200 | B (b) [Jan Dudek] | |
| 530ef46 2014-06-25 15:08:41 +0200 | initial commit [Jan Dudek] | |
| ~/tmp/git-example (master) $ git log c | |
| 773f7a1 2014-06-25 15:26:13 +0200 | C (c) [Jan Dudek] | |
| 530ef46 2014-06-25 15:08:41 +0200 | initial commit [Jan Dudek] | |
| ~/tmp/git-example (master) $ git merge b c | |
| Trying simple merge with b | |
| Simple merge did not work, trying automatic merge. | |
| Auto-merging file | |
| Trying simple merge with c | |
| Simple merge did not work, trying automatic merge. | |
| Auto-merging file | |
| Merge made by the 'octopus' strategy. | |
| file | 2 ++ | |
| 1 file changed, 2 insertions(+) | |
| ~/tmp/git-example (master) $ git cat-file -p HEAD | |
| tree b966cf76a498ec765bed3a9b426c0b8724fc76f9 | |
| parent fc8f07f19628c32d0d691d8cdee194dc9adb1903 | |
| parent 86c2a22240fa2c3ce7a3811ba864dd6b601f8b53 | |
| parent 773f7a14c90614803a224782cb278bf3301a3049 | |
| author Jan Dudek <jd@jandudek.com> 1403702785 +0200 | |
| committer Jan Dudek <jd@jandudek.com> 1403702785 +0200 | |
| Merge branches 'b' and 'c' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment