Created
December 12, 2012 18:29
-
-
Save danhart/4270300 to your computer and use it in GitHub Desktop.
git show the conflicting commit during a rebase
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
| function show_patch() { | |
| git show $(head -1 .git/rebase-apply/${1} | awk '{ print $2 }') | |
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
e.g. when, during a rebase, git output's "Patch failed at 0001". Then: