Created
February 25, 2015 23:32
-
-
Save natefoo/9fd47410b92a46ff73d3 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
| nate@weyerbacher% git branch | |
| * master | |
| nate@weyerbacher% git log | |
| commit 1572db612b5f7149ceb8001b74f67d662048af00 | |
| Merge: db2c863 899330c | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:13:57 2015 -0500 | |
| Merge branch 'feature' | |
| commit db2c86348143e9fc2ca976ef1b5e8311202a8374 | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:10:36 2015 -0500 | |
| Added quux on master | |
| commit 899330cb8aab7a086e17bc79146358e930e16585 | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:10:36 2015 -0500 | |
| Added quux on master | |
| (cherry picked from commit db2c86348143e9fc2ca976ef1b5e8311202a8374) | |
| commit 210aa2ddbb76363389697c4b4e35209e68bead6f | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:09:05 2015 -0500 | |
| added foo on master | |
| commit 352916eef3b68eff685665a2f7616c9046c2b552 | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:10:12 2015 -0500 | |
| Added baz on feature | |
| commit f178991b4453cd17bc8c9b1651bdf4afc8897c24 | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:09:44 2015 -0500 | |
| Committed bar on feature | |
| nate@weyerbacher% git format-patch -k -o patch.d 210aa2d | |
| patch.d/0001-Committed-bar-on-feature.patch | |
| patch.d/0002-Added-baz-on-feature.patch | |
| patch.d/0003-Added-quux-on-master.patch | |
| patch.d/0004-Added-quux-on-master.patch | |
| nate@weyerbacher% git rebase 210aa2d | |
| First, rewinding head to replay your work on top of it... | |
| Applying: Committed bar on feature | |
| Applying: Added baz on feature | |
| Applying: Added quux on master | |
| Applying: Added quux on master | |
| Using index info to reconstruct a base tree... | |
| Falling back to patching base and 3-way merge... | |
| No changes -- Patch already applied. | |
| nate@weyerbacher% git log | |
| commit 899330cb8aab7a086e17bc79146358e930e16585 | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:10:36 2015 -0500 | |
| Added quux on master | |
| (cherry picked from commit db2c86348143e9fc2ca976ef1b5e8311202a8374) | |
| commit 352916eef3b68eff685665a2f7616c9046c2b552 | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:10:12 2015 -0500 | |
| Added baz on feature | |
| commit f178991b4453cd17bc8c9b1651bdf4afc8897c24 | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:09:44 2015 -0500 | |
| Committed bar on feature | |
| commit 210aa2ddbb76363389697c4b4e35209e68bead6f | |
| Author: Nate Coraor <nate@bx.psu.edu> | |
| Date: Wed Feb 25 18:09:05 2015 -0500 | |
| added foo on master | |
| nate@weyerbacher% git format-patch -k -o patch.d 210aa2d | |
| patch.d/0001-Committed-bar-on-feature.patch | |
| patch.d/0002-Added-baz-on-feature.patch | |
| patch.d/0003-Added-quux-on-master.patch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment