]> git.ipfire.org Git - thirdparty/git.git/commit - contrib/completion/git-completion.bash
am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 20 Feb 2020 14:15:19 +0000 (15:15 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Feb 2020 21:20:41 +0000 (13:20 -0800)
commitaa416b22ea73321aba94c3c96db0491fb25ea7ea
treea0e3e1c9f67208bfbdf6666da0221a1574c9d52a
parentf3b4822899dc4ddca688de285f01e1d12aeb33b6
am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch

When "git am --show-current-patch" was added in commit 984913a210 ("am:
add --show-current-patch", 2018-02-12), "git am" started recommending it
as a replacement for .git/rebase-merge/patch.  Unfortunately the suggestion
is somewhat misguided; for example, the output of "git am --show-current-patch"
cannot be passed to "git apply" if it is encoded as quoted-printable
or base64.  Add a new mode to "git am --show-current-patch" in order to
straighten the suggestion.

Reported-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-am.txt
builtin/am.c
contrib/completion/git-completion.bash
t/t4150-am.sh