Merge branch 'nd/worktree' into HEAD

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 82165763ba138e587a59d5b5cea03e3b7a9af072..b1f528ae8864e429a509365a79d16bb8341620e1 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -43,7 +43,9 @@
        Synonym for "-p --stat".
 
 -z::
-       \0 line termination on output
+       NUL-line termination on output.  This affects the --raw
+       output field terminator.  Also output from commands such
+       as "git-log" will be delimited with NUL between commits.
 
 --name-only::
        Show only names of changed files.
@@ -177,8 +179,8 @@
 
 --ext-diff::
        Allow an external diff helper to be executed. If you set an
-       external diff driver with gitlink:gitattributes(5), you need
-       to use this option with gitlink:git-log(1) and friends.
+       external diff driver with gitlink:gitattributes[5], you need
+       to use this option with gitlink:git-log[1] and friends.
 
 --no-ext-diff::
        Disallow external diff drivers.