Merge branch 'db/send-email-omit-cc'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 1a78635fbae314e5b6bc02571b573c4bfdba5e29..8d35cbd60d9d6fb2a0aeef8a6b956e099743cb28 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -205,8 +205,8 @@ endif::git-format-patch[]
 
 --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 linkgit:gitattributes[5], you need
+       to use this option with linkgit:git-log[1] and friends.
 
 --no-ext-diff::
        Disallow external diff drivers.