Skip to content

Commit de54ef2

Browse files
gitstergitster
committed
Merge branch 'da/difftool-updates'
"git difftool --dir-diff" learned to use symbolic links to prepare temporary copy of the working tree when available. * da/difftool-updates: difftool: silence warning Add Code Compare v2.80.4 as a merge / diff tool for Windows mergetool,difftool: Document --tool-help consistently difftool: Disable --symlinks on cygwin difftool: Handle compare() returning -1 difftool: Wrap long lines for readability difftool: Check all return codes from compare() difftool: Handle finding mergetools/ in a path with spaces difftool: Use symlinks when diffing against the worktree difftool: Call the temp directory "git-difftool" difftool: Move option values into a hash difftool: Eliminate global variables difftool: Simplify print_tool_help()
2 parents 445d2c5 + ed36e5b commit de54ef2

File tree

6 files changed

+244
-101
lines changed

6 files changed

+244
-101
lines changed

‎Documentation/git-difftool.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ with custom merge tool commands and has the same value as `$MERGED`.
6969
--tool-help::
7070
Print a list of diff tools that may be used with `--tool`.
7171

72+
--symlinks::
73+
--no-symlinks::
74+
'git difftool''s default behavior is create symlinks to the
75+
working tree when run in `--dir-diff` mode.
76+
+
77+
Specifying `--no-symlinks` instructs 'git difftool' to create
78+
copies instead. `--no-symlinks` is the default on Windows.
79+
7280
-x <command>::
7381
--extcmd=<command>::
7482
Specify a custom command for viewing diffs.

‎Documentation/git-mergetool.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`.
6464
Otherwise, 'git mergetool' will prompt the user to indicate the
6565
success of the resolution after the custom tool has exited.
6666

67+
--tool-help::
68+
Print a list of merge tools that may be used with `--tool`.
69+
6770
-y::
6871
--no-prompt::
6972
Don't prompt before each invocation of the merge resolution

‎contrib/completion/git-completion.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ _git_diff ()
10711071
}
10721072

10731073
__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
1074-
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
1074+
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
10751075
"
10761076

10771077
_git_difftool ()

0 commit comments

Comments
 (0)