diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:04:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:04:31 -0800 |
| commit | 45072eefef522935c7cb8cbf5ee8226aba2406ac (patch) | |
| tree | d285109f2a36d81de4f2d653e95f51c390e3f503 /Documentation/git-am.txt | |
| parent | a2082dbdd315aa4dd3f315545e5b3ab3b3e2d894 (diff) | |
| parent | a171dac73496138ba1ac15a6689ee5478c9a88d0 (diff) | |
| download | git-45072eefef522935c7cb8cbf5ee8226aba2406ac.tar.gz | |
Merge branch 'jc/am-whitespace-doc'
"git am --help" now tells readers what actions are available in
"git am --whitespace=<action>", in addition to saying that the
option is passed through to the underlying "git apply".
* jc/am-whitespace-doc:
doc: add shortcut to "am --whitespace=<action>"
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index e080458d6c..463a3c6600 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -128,6 +128,9 @@ include::rerere-options.txt[] These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch. ++ +Valid <action> for the `--whitespace` option are: +`nowarn`, `warn`, `fix`, `error`, and `error-all`. --patch-format:: By default the command will try to detect the patch format |