diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:02 +0300 |
| commit | 9ca488c04bdab90668471640baeb0d9140be064c (patch) | |
| tree | 6a1e4c6acaff06f234b12fdbb0b4ad9ab3bc8048 /git-rebase--am.sh | |
| parent | 2cd91ec1970bd89e6b4b79b5aa41f27435625e71 (diff) | |
| parent | fbd7a23237094c3fb2e249bbcacbbf1e858e79c9 (diff) | |
Merge branch 'nd/rebase-show-current-patch'
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
Diffstat (limited to 'git-rebase--am.sh')
| -rw-r--r-- | git-rebase--am.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 0f78051792..be3f068922 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -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" |