diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/git-am.txt | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/git-am.txt')
| -rw-r--r-- | third_party/git/Documentation/git-am.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/third_party/git/Documentation/git-am.txt b/third_party/git/Documentation/git-am.txt index ab5754e05d16..fc3b993c3338 100644 --- a/third_party/git/Documentation/git-am.txt +++ b/third_party/git/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[=(diff|raw)]) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch) DESCRIPTION ----------- @@ -176,11 +176,9 @@ default. You can use `--no-utf8` to override this. Abort the patching operation but keep HEAD and the index untouched. ---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`. +--show-current-patch:: + Show the patch being applied when "git am" is stopped because + of conflicts. DISCUSSION ---------- @@ -192,8 +190,8 @@ the commit, after stripping common prefix "[PATCH <anything>]". The "Subject: " line is supposed to concisely describe what the commit is about in one line of text. -"From: ", "Date: ", and "Subject: " lines starting the body override the -respective commit author name and title values taken from the headers. +"From: " and "Subject: " lines starting the body override the respective +commit author name and title values taken from the headers. The commit message is formed by the title taken from the "Subject: ", a blank line and the body of the message up to |