summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-02-20 14:15:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-20 21:20:41 (GMT)
commitaa416b22ea73321aba94c3c96db0491fb25ea7ea (patch)
treea0e3e1c9f67208bfbdf6666da0221a1574c9d52a /contrib
parentf3b4822899dc4ddca688de285f01e1d12aeb33b6 (diff)
downloadgit-aa416b22ea73321aba94c3c96db0491fb25ea7ea.zip
git-aa416b22ea73321aba94c3c96db0491fb25ea7ea.tar.gz
git-aa416b22ea73321aba94c3c96db0491fb25ea7ea.tar.bz2
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>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2673fc1..b33c23b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1180,7 +1180,7 @@ __git_count_arguments ()
__git_whitespacelist="nowarn warn error error-all fix"
__git_patchformat="mbox stgit stgit-series hg mboxrd"
-__git_showcurrentpatch="raw"
+__git_showcurrentpatch="diff raw"
__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
_git_am ()