summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-05-08 20:16:55 -0500
committerJunio C Hamano <gitster@pobox.com>2013-05-17 12:09:21 -0700
commit0460ed2c93d78c753242f835c441f320f792ac54 (patch)
tree7128ca5567b1ed56dba60845ad26b32c40d7a4f5 /Documentation/git-difftool.txt
parent9b795193a6a7e963db62d9cd8e86752a40940520 (diff)
downloadgit-0460ed2c93d78c753242f835c441f320f792ac54.tar.gz
documentation: trivial style cleanups
White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
-rw-r--r--Documentation/git-difftool.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 8361e6e4e3..11887e63a0 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -69,8 +69,7 @@ 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::
+--[no-]symlinks::
'git difftool''s default behavior is create symlinks to the
working tree when run in `--dir-diff` mode and the right-hand
side of the comparison yields the same content as the file in