Merge branch 'rs/maint-archive-match-pathspec'

[git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 18366b1be60a61beed16dd67fcab6151b4ecd55e..8707d0e7404543d0565d72566a8db5946d9467ee 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -87,19 +87,21 @@ endif::git-format-patch[]
 ifndef::git-format-patch[]
 
 -z::
+ifdef::git-log[]
+       Separate the commits with NULs instead of with new newlines.
++
+Also, when `--raw` or `--numstat` has been given, do not munge
+pathnames and use NULs as output field terminators.
+endif::git-log[]
 ifndef::git-log[]
        When `--raw` or `--numstat` has been given, do not munge
        pathnames and use NULs as output field terminators.
+endif::git-log[]
 +
 Without this option, each pathname output will have TAB, LF, double quotes,
 and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`,
 respectively, and the pathname will be enclosed in double quotes if
 any of those replacements occurred.
-endif::git-log[]
-
-ifdef::git-log[]
-       Separate the commits with NULs instead of with new newlines.
-endif::git-log[]
 
 --name-only::
        Show only names of changed files.