diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:33:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:33:32 -0800 |
| commit | cd35a3e51ec6c53477e9a0734ba4abb720e94f02 (patch) | |
| tree | 9d0c655bfc547e5fba131454c18bb42359f7fc6e /git-am.txt | |
| parent | 69787bb1d0d3e52e2aac8718bd9824f65bbe4fe4 (diff) | |
| download | git-htmldocs-cd35a3e51ec6c53477e9a0734ba4abb720e94f02.tar.gz | |
Autogenerated HTML docs for v2.44.0-53-g0f9d4
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-am.txt b/git-am.txt index e080458d6..463a3c660 100644 --- a/git-am.txt +++ b/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 |