Created
May 16, 2009 03:47
-
-
Save nothingmuch/112560 to your computer and use it in GitHub Desktop.
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
| • [syeeda:/tmp/foo] nothingmuch % git reset --hard contributer@{1} | |
| HEAD is now at c4ac515 modify foo | |
| • [syeeda:/tmp/foo] nothingmuch % git merge master | |
| Merge made by recursive. | |
| • [syeeda:/tmp/foo] nothingmuch % git log --all --decorate | |
| commit 7290abd93ecc30e984b93bd7eed577baef5f2ba1 (refs/heads/contributer) | |
| Merge: c4ac515... 1515d1a... | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 05:47:05 2009 +0200 | |
| Merge branch 'master' into contributer | |
| commit 1515d1a001db99c95e3175fe1ace077f233ecac4 (refs/heads/master) | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 05:43:20 2009 +0200 | |
| modify foo | |
| Signed-off-by: Yuval Kogman <nothingmuch@woobling.org> | |
| commit c4ac51521065d636b1141ca433e6074f4e79c836 | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 05:43:20 2009 +0200 | |
| modify foo | |
| commit 403b7b40b25de673b0f0c2e0c74ef78e202fdf16 | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 05:43:06 2009 +0200 | |
| add foo | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment