diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-03-06 14:54:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 14:54:02 -0800 |
| commit | 9ca488c04bdab90668471640baeb0d9140be064c (patch) | |
| tree | 6a1e4c6acaff06f234b12fdbb0b4ad9ab3bc8048 /git-sh-setup.sh | |
| parent | Merge branch 'xz/send-email-batch-size' (diff) | |
| parent | rebase: introduce and use pseudo-ref REBASE_HEAD (diff) | |
| download | tgif-9ca488c04bdab90668471640baeb0d9140be064c.tar.xz | |
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-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions