Created
May 16, 2009 03:45
-
-
Save nothingmuch/112559 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
| • [syeeda:/tmp/foo] nothingmuch % git init | |
| Initialized empty Git repository in /private/tmp/foo/.git/ | |
| • [syeeda:/tmp/foo] nothingmuch % echo foo > foo | |
| • [syeeda:/tmp/foo] nothingmuch % git add foo | |
| • [syeeda:/tmp/foo] nothingmuch % git commit -m "add foo" | |
| [master (root-commit)]: created 403b7b4: "add foo" | |
| 1 files changed, 1 insertions(+), 0 deletions(-) | |
| create mode 100644 foo | |
| • [syeeda:/tmp/foo] nothingmuch % git checkout -b contributer | |
| Switched to a new branch "contributer" | |
| • [syeeda:/tmp/foo] nothingmuch % echo bar >> foo | |
| • [syeeda:/tmp/foo] nothingmuch % git commit -am "modify foo" | |
| [contributer]: created c4ac515: "modify foo" | |
| 1 files changed, 1 insertions(+), 0 deletions(-) | |
| • [syeeda:/tmp/foo] nothingmuch % git checkout master | |
| Switched to branch "master" | |
| • [syeeda:/tmp/foo] nothingmuch % git cherry-pick --signoff contributer | |
| Finished one cherry-pick. | |
| [master]: created 1515d1a: "modify foo" | |
| 1 files changed, 1 insertions(+), 0 deletions(-) | |
| • [syeeda:/tmp/foo] nothingmuch % git log --all --decorate | |
| 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 (refs/heads/contributer) | |
| 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 | |
| • [syeeda:/tmp/foo] nothingmuch % git checkout contributer | |
| Switched to branch "contributer" | |
| • [syeeda:/tmp/foo] nothingmuch % git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| Nothing to do. | |
| • [syeeda:/tmp/foo] nothingmuch % git log --all --decorate | |
| commit 1515d1a001db99c95e3175fe1ace077f233ecac4 (refs/heads/master, refs/heads/contributer) | |
| 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 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