From: Junio C Hamano <gitster@pobox.com>
To: Jerry Zhang <jerry@skydio.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH V4] git-apply: add --allow-empty flag
Date: Mon, 13 Dec 2021 13:44:31 -0800 [thread overview]
Message-ID: <xmqqlf0ob2o0.fsf@gitster.g> (raw)
In-Reply-To: <20211213202826.7051-1-jerry@skydio.com> (Jerry Zhang's message of "Mon, 13 Dec 2021 12:28:26 -0800")
Jerry Zhang <jerry@skydio.com> writes:
> 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?
next prev parent reply other threads:[~2021-12-13 21:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 1:12 [PATCH] git-apply: allow empty patch text Jerry Zhang
2021-04-27 5:46 ` Eric Wong
2021-04-27 6:28 ` Junio C Hamano
2021-04-27 19:40 ` [PATCH V2] git-apply: add --allow-empty flag Jerry Zhang
2021-04-28 5:08 ` Junio C Hamano
2021-04-28 18:40 ` Jerry Zhang
2021-04-29 0:32 ` Ævar Arnfjörð Bjarmason
2021-12-11 3:13 ` [PATCH V3] " Jerry Zhang
2021-12-11 7:36 ` Bagas Sanjaya
2021-12-13 20:28 ` [PATCH V4] " Jerry Zhang
2021-12-13 21:44 ` Junio C Hamano [this message]
2021-12-13 21:52 ` Jerry Zhang
2021-12-13 21:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlf0ob2o0.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jerry@skydio.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).