From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: kelly elton <its.the.doc@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] apply: clarify "-p" documentation
Date: Fri, 11 May 2018 12:34:05 +0900 [thread overview]
Message-ID: <xmqqin7uhnma.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180510142924.GB25617@sigill.intra.peff.net> (Jeff King's message of "Thu, 10 May 2018 10:29:24 -0400")
Jeff King <peff@peff.net> writes:
> How about this?
>
> -- >8 --
> Subject: [PATCH] apply: clarify "-p" documentation
>
> We're not really removing slashes, but slash-separated path
> components. Let's make that more clear.
>
> Reported-by: kelly elton <its.the.doc@gmail.com>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Documentation/git-apply.txt | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
> index 4ebc3d3271..c993fbf714 100644
> --- a/Documentation/git-apply.txt
> +++ b/Documentation/git-apply.txt
> @@ -113,8 +113,10 @@ explained for the configuration variable `core.quotePath` (see
> linkgit:git-config[1]).
>
> -p<n>::
> - Remove <n> leading slashes from traditional diff paths. The
> - default is 1.
> + Remove <n> leading path components (separated by slashes) from
> + traditional diff paths. E.g., with `-p2`, a patch against
> + `a/dir/file` will be applied directly to `file`. The default is
> + 1.
Thanks for an obvious improvement. Will queue.
>
> -C<n>::
> Ensure at least <n> lines of surrounding context match before
prev parent reply other threads:[~2018-05-11 3:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-27 17:40 Confusing documentation for git apply -p<n> kelly elton
2018-05-10 14:29 ` [PATCH] apply: clarify "-p" documentation Jeff King
2018-05-11 3:34 ` Junio C Hamano [this message]
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=xmqqin7uhnma.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=its.the.doc@gmail.com \
--cc=peff@peff.net \
/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).