Björn Gustavsson <bgustavsson@xxxxxxxxx> 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@xxxxxxxxx> > --- > 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html