diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-02-20 14:15:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-20 21:20:41 (GMT) |
| commit | aa416b22ea73321aba94c3c96db0491fb25ea7ea (patch) | |
| tree | a0e3e1c9f67208bfbdf6666da0221a1574c9d52a /Documentation/git-am.txt | |
| parent | f3b4822899dc4ddca688de285f01e1d12aeb33b6 (diff) | |
| download | git-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 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 590b711..ab5754e 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -16,7 +16,7 @@ SYNOPSIS [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [(<mbox> | <Maildir>)...] -'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=raw]) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) DESCRIPTION ----------- @@ -176,10 +176,11 @@ default. You can use `--no-utf8` to override this. Abort the patching operation but keep HEAD and the index untouched. ---show-current-patch[=raw]:: - Show the raw contents of the e-mail message at which `git am` - has stopped due to conflicts. The argument must be omitted or - `raw`. +--show-current-patch[=(diff|raw)]:: + Show the message at which `git am` has stopped due to + conflicts. If `raw` is specified, show the raw contents of + the e-mail message; if `diff`, show the diff portion only. + Defaults to `raw`. DISCUSSION ---------- |