Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-difftool(1): fix formatting of --symlink description
author
John Keeping
<john@keeping.me.uk>
Thu, 14 Mar 2013 20:19:39 +0000
(20:19 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 14 Mar 2013 21:29:02 +0000
(14:29 -0700)
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-difftool.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
55f56fe
)
diff --git
a/Documentation/git-difftool.txt
b/Documentation/git-difftool.txt
index e0e12e947034b3f690d7f103ee90e0bc1a21f926..e575fea1ad77eef80cd0460b66b7925a08a65f0d 100644
(file)
--- a/
Documentation/git-difftool.txt
+++ b/
Documentation/git-difftool.txt
@@
-74,8
+74,8
@@
with custom merge tool commands and has the same value as `$MERGED`.
'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.
+Specifying `--no-symlinks` instructs 'git difftool' to create copies
+instead. `--no-symlinks` is the default on Windows.
-x <command>::
--extcmd=<command>::