From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2018 22:54:02 +0000 (-0800)
Subject: Merge branch 'nd/rebase-show-current-patch'
X-Git-Tag: v2.17.0-rc0~46
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ca488c04bdab90668471640baeb0d9140be064c?hp=9ca488c04bdab90668471640baeb0d9140be064c

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
---