diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-09 23:08:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-09 23:08:58 -0700 |
| commit | 35a5155ef556183ec87fa45c0d7314dc4e2d70b3 (patch) | |
| tree | 21d0d96ca30256180a1c409bb709cddfb03d8156 /git-am.txt | |
| parent | b082a53e847d444f274aac11769b625241a41060 (diff) | |
| download | git-htmldocs-35a5155ef556183ec87fa45c0d7314dc4e2d70b3.tar.gz | |
Autogenerated HTML docs for v2.26.0-rc1
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-am.txt b/git-am.txt index 11ca61b00..ab5754e05 100644 --- a/git-am.txt +++ b/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) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) DESCRIPTION ----------- @@ -176,9 +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:: - Show the entire e-mail message "git am" has stopped at, because - of conflicts. +--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 ---------- |