Merge branch 'rf/maint-mailmap-off-by-one'

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 31fc2e3aed613acd8cb6e4a56ae66c378fb07a0d..73ca7025a39630907e3a019dfed14542f4ac7538 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -69,6 +69,14 @@ with custom merge tool commands and has the same value as `$MERGED`.
 --tool-help::
        Print a list of diff tools that may be used with `--tool`.
 
+--symlinks::
+--no-symlinks::
+       'git difftool''s default behavior is create symlinks to the
+       working tree when run in `--dir-diff` mode.
++
+       Specifying `--no-symlinks` instructs 'git difftool' to create
+       copies instead.  `--no-symlinks` is the default on Windows.
+
 -x <command>::
 --extcmd=<command>::
        Specify a custom command for viewing diffs.