mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/rebase-show-current-patch'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2018-03-06 14:54:02 -08:00
parent 2cd91ec197 fbd7a23237
commit 9ca488c04b
12 changed files with 130 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase--am.sh
View File

@ -27,6 +27,9 @@ skip)
move_to_original_branch
return
;;
show-current-patch)
exec git am --show-current-patch
;;
esac
if test -z "$rebase_root"