Created
May 16, 2009 04:09
-
-
Save nothingmuch/112566 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 log | |
| commit 72f802f6b0318ed9bad918fd1e9b4fabb293f6c7 | |
| Merge: 5b7fe70... ec9dcfb... | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 06:08:27 2009 +0200 | |
| Merge branch 'master' into contrib | |
| commit ec9dcfb20d582d87c230da5c4f65bd0d9cfd5bba | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 06:08:05 2009 +0200 | |
| bar | |
| Signed-off-by: Yuval Kogman <nothingmuch@woobling.org> | |
| commit 5b7fe70bfc7b7a44ee0cd64812718264947cff50 | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 06:08:05 2009 +0200 | |
| bar | |
| commit f5b79bbc24014abc4206646ee708fb542b48b30c | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 06:07:51 2009 +0200 | |
| add foo | |
| • [syeeda:/tmp/foo] nothingmuch % git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| Applying: bar | |
| error: patch failed: foo:1 | |
| error: foo: patch does not apply | |
| Using index info to reconstruct a base tree... | |
| Falling back to patching base and 3-way merge... | |
| No changes -- Patch already applied. | |
| • [syeeda:/tmp/foo] nothingmuch % git log | |
| commit ec9dcfb20d582d87c230da5c4f65bd0d9cfd5bba | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 06:08:05 2009 +0200 | |
| bar | |
| Signed-off-by: Yuval Kogman <nothingmuch@woobling.org> | |
| commit f5b79bbc24014abc4206646ee708fb542b48b30c | |
| Author: Yuval Kogman <nothingmuch@woobling.org> | |
| Date: Sat May 16 06:07:51 2009 +0200 | |
| add foo | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment