projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ceb1497
)
difftool: Disable --symlinks on cygwin
author
David Aguilar
<davvid@gmail.com>
Wed, 25 Jul 2012 03:14:24 +0000
(20:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 26 Jul 2012 20:07:15 +0000
(13:07 -0700)
Symlinks are not ubiquitous on Windows so make --no-symlinks the default.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-difftool.perl
patch
|
blob
|
history
diff --git
a/git-difftool.perl
b/git-difftool.perl
index 6f8bb73cd6a3925bba575be429d231a7e160e623..17d4de661820e8c7ae24694a21458be825b1ac9a 100755
(executable)
--- a/
git-difftool.perl
+++ b/
git-difftool.perl
@@
-338,7
+338,8
@@
sub main
gui => undef,
help => undef,
prompt => undef,
- symlinks => $^O ne 'MSWin32' && $^O ne 'msys',
+ symlinks => $^O ne 'cygwin' &&
+ $^O ne 'MSWin32' && $^O ne 'msys',
tool_help => undef,
);
GetOptions('g|gui!' => \$opts{gui},