diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-23 00:31:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-23 00:31:01 -0800 |
| commit | 3cb60ffb58b400b0d281389d019996b1d9d83b78 (patch) | |
| tree | 757f79a272cda6e13edd8030b89e271b197b8a48 /git-apply.txt | |
| parent | 5009f01c2d5c4f539728c0f01b0b6445242fc7c6 (diff) | |
| download | git-htmldocs-3cb60ffb58b400b0d281389d019996b1d9d83b78.tar.gz | |
Autogenerated HTML docs for v2.34.1-390-g2ae0a
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-apply.txt b/git-apply.txt index aa1ae56a2..b6d77f420 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -16,7 +16,7 @@ SYNOPSIS [--ignore-space-change | --ignore-whitespace] [--whitespace=(nowarn|warn|fix|error|error-all)] [--exclude=<path>] [--include=<path>] [--directory=<root>] - [--verbose] [--unsafe-paths] [<patch>...] + [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...] DESCRIPTION ----------- @@ -228,6 +228,11 @@ behavior: current patch being applied will be printed. This option will cause additional information to be reported. +-q:: +--quiet:: + Suppress stderr output. Messages about patch status and progress + will not be printed. + --recount:: Do not trust the line counts in the hunk headers, but infer them by inspecting the patch (e.g. after editing the patch without @@ -251,6 +256,10 @@ When `git apply` is used as a "better GNU patch", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use. +--allow-empty:: + Don't return error for patches containing no diff. This includes + empty patches and patches with commit text only. + CONFIGURATION ------------- |