git/Documentation/git-difftool.txt, branch v2.3.7

difftool: add support for --trust-exit-code

2014-10-28T17:36:57Z

Teach difftool to exit when a diff tool returns a non-zero exit code when either --trust-exit-code is specified or difftool.trustExitCode is true. Forward exit codes from invoked diff tools to the caller when --trust-exit-code is used. Suggested-by: Adri Farr <14farresa@gmail.com> Helped-by: Johannes Sixt Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

documentation: trivial style cleanups

2013-05-17T19:09:21Z

White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

difftool --dir-diff: symlink all files matching the working tree

2013-03-14T21:33:06Z

Some users like to edit files in their diff tool when using "git difftool --dir-diff --symlink" to compare against the working tree but difftool currently only created symlinks when a file contains unstaged changes. Change this behaviour so that symlinks are created whenever the right-hand side of the comparison has the same SHA1 as the file in the working tree. Note that textconv filters are handled in the same way as by git-diff and if a clean filter is not the inverse of its smudge filter we already get a null SHA1 from "diff --raw" and will symlink the file without going through the new hash-object based check. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

git-difftool(1): fix formatting of --symlink description

2013-03-14T21:29:02Z

Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Documentation: the name of the system is 'Git', not 'git'

2013-02-01T21:53:33Z

Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

mergetool,difftool: Document --tool-help consistently

2012-08-10T15:07:41Z

Add an entry for --tool-help to the mergetool documentation. Move --tool-help in the difftool documentation so that it is listed immediately after --tool so that it is easier to find. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Use symlinks when diffing against the worktree

2012-07-23T16:35:53Z

Teach difftool's --dir-diff mode to use symlinks to represent files from the working copy, and make it the default behavior for the non-Windows platforms. Using symlinks is simpler and safer since we do not need to worry about copying files back into the worktree. The old behavior is still available as --no-symlinks. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: print list of valid tools with '--tool-help'

2012-04-23T19:00:42Z

Since bc7a96a (mergetool--lib: Refactor tools into separate files, 2011-08-18), it is possible to add a new diff tool by creating a simple script in the '$(git --exec-path)/mergetools' directory. Updating the difftool help text is still a manual process, and the documentation can easily go out of sync. This commit teaches difftool the '--tool-help' option, which: - Reads the list of valid tools from 'mergetools/*' - Determines which of them are actually installed - Determines which are capable of diffing (i.e. not just a merge tool) - Prints the resulting list for the user Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: teach difftool to handle directory diffs

2012-04-23T18:59:34Z

When 'difftool' is called to compare a range of commits that modify more than one file, it opens a separate instance of the diff tool for each file that changed. The new '--dir-diff' option copies all the modified files to a temporary location and runs a directory diff on them in a single instance of the diff tool. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

Documentation/difftool: add deltawalker to list of valid diff tools

2012-03-15T20:53:39Z

deltawalker has been supported since 284a126c3ef3, but was not added to the list of valid diff tools reported by 'git difftool --help'. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano