Skip to content

Commit

Permalink
Merge branch 'da/difftool-updates'
Browse files Browse the repository at this point in the history
"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()
  • Loading branch information
Junio C Hamano committed Aug 27, 2012
2 parents 445d2c5 + ed36e5b commit de54ef2
Show file tree
Hide file tree
Showing 6 changed files with 244 additions and 101 deletions.
8 changes: 8 additions & 0 deletions Documentation/git-difftool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions Documentation/git-mergetool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`.
Otherwise, 'git mergetool' will prompt the user to indicate the
success of the resolution after the custom tool has exited.

--tool-help::
Print a list of merge tools that may be used with `--tool`.

-y::
--no-prompt::
Don't prompt before each invocation of the merge resolution
Expand Down
2 changes: 1 addition & 1 deletion contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ _git_diff ()
}

__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
"

_git_difftool ()
Expand Down
Loading

0 comments on commit de54ef2

Please sign in to comment.