Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Björn Gustavsson" <bgustavsson@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/4] apply: Clarify the description of -z
Date: Sun, 22 Nov 2009 09:28:55 -0800	[thread overview]
Message-ID: <7v8wdyii3s.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 4B09648E.5060203@gmail.com

Björn Gustavsson <bgustavsson@gmail.com> writes:

> The description of -z says that a machine-readable format will be
> used "when showing the index information". From that description,
> it is not at all clear which other option it will modify the
> behaviour of. Explicitly state that -z modifies the behavior
> of --numstat.
>
> Also correct the description of the "munging" that takes places
> in the absence of -z, namely that apart from the characters
> mentioned, double quotes are also escaped and that the pathname
> will be enclosed in double quotes if any characters are escaped.
>
> Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
> ---
>  Documentation/git-apply.txt |   12 +++++++-----
>  1 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
> index 5ee8c91..4f791ee 100644
> --- a/Documentation/git-apply.txt
> +++ b/Documentation/git-apply.txt
> @@ -87,11 +87,13 @@ the information is read from the current index instead.
>  	rejected hunks in corresponding *.rej files.
>  
>  -z::
> -	When showing the index information, do not munge paths,
> -	but use NUL terminated machine readable format.  Without
> -	this flag, the pathnames output will have TAB, LF, and
> -	backslash characters replaced with `\t`, `\n`, and `\\`,
> -	respectively.

I think diff-format.txt has the same description; could you please update
that to be in sync?

      reply	other threads:[~2009-11-22 17:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-22 16:19 [PATCH 1/4] apply: Clarify the description of -z Björn Gustavsson
2009-11-22 17:28 ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v8wdyii3s.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=bgustavsson@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox