Re: [PATCH V4] git-apply: add --allow-empty flag
From: Junio C Hamano <hidden>
Date: 2021-12-13 21:44:38
Jerry Zhang [off-list ref] writes:
quoted hunk
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index a32ad64718..b6d77f4206 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt@@ -14,11 +14,11 @@ SYNOPSIS [--allow-binary-replacement | --binary] [--reject] [-z] [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached] [--ignore-space-change | --ignore-whitespace] [--whitespace=(nowarn|warn|fix|error|error-all)] [--exclude=<path>] [--include=<path>] [--directory=<root>] - [--verbose | --quiet] [--unsafe-paths] [<patch>...] + [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...] DESCRIPTION ----------- Reads the supplied diff output (i.e. "a patch") and applies it to files. When running from a subdirectory in a repository, patched paths
Applying: git-apply: add --allow-empty flag error: patch failed: Documentation/git-apply.txt:14 error: Documentation/git-apply.txt: patch does not apply Patch failed at 0001 git-apply: add --allow-empty flag Hmph.... Where did that "| --quiet" thing come from?