The new "--show-current-patch" option gives an end-user facing way
to get the diff being applied when "git rebase" (and "git am")
stops with a conflict.
* nd/rebase-show-current-patch:
rebase: introduce and use pseudo-ref REBASE_HEAD
rebase: add --show-current-patch
am: add --show-current-patch
@ -255,6 +255,11 @@ leave out at most one of A and B, in which case it defaults to HEAD.
@@ -255,6 +255,11 @@ leave out at most one of A and B, in which case it defaults to HEAD.
--edit-todo::
Edit the todo list during an interactive rebase.
--show-current-patch::
Show the current patch in an interactive rebase or when rebase
is stopped because of conflicts. This is the equivalent of
`git show REBASE_HEAD`.
-m::
--merge::
Use merging strategies to rebase. When the recursive (default) merge
@ -46,6 +46,7 @@ abort! abort and check out the original branch
@@ -46,6 +46,7 @@ abort! abort and check out the original branch
skip! skip current patch and continue
edit-todo! edit the todo list during an interactive rebase
quit! abort but keep HEAD where it is
show-current-patch! show the patch file being applied or merged
"
. git-sh-setup
set_reflog_action rebase
@ -183,6 +184,7 @@ You can run "git stash pop" or "git stash drop" at any time.
@@ -183,6 +184,7 @@ You can run "git stash pop" or "git stash drop" at any time.