danhart/gist:4270300

Created December 12, 2012 18:29

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/danhart/4270300.js"></script>
Save danhart/4270300 to your computer and use it in GitHub Desktop.

Download ZIP

git show the conflicting commit during a rebase

Raw

gistfile1.sh

	function show_patch() {
	git show $(head -1 .git/rebase-apply/${1} \| awk '{ print $2 }')
	}

Author

danhart commented Dec 13, 2012

e.g. when, during a rebase, git output's "Patch failed at 0001". Then:

show_patch 0001

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment