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

difftool.c: learn a new way start at specified file

2021-02-22T21:35:49Z

`git difftool` only allow us to select file to view in turn. If there is a commit with many files and we exit in the middle, we will have to traverse list again to get the file diff which we want to see. Therefore,teach the command an option `--skip-to=` to allow the user to say that diffs for earlier paths are not interesting (because they were already seen in an earlier session) and start this session with the named path. Signed-off-by: ZheNing Hu Signed-off-by: Junio C Hamano

difftool: fallback on merge.guitool

2019-05-13T14:11:59Z

In git-difftool.txt, it says 'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined. However, when `diff.guitool` is missing, it doesn't fallback to anything. Make git-difftool fallback to `merge.guitool` when `diff.guitool` is missing. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

Document the --no-gui option in difftool

2017-02-08T21:30:28Z

Prior to this, the `--no-gui` option was not documented in the manpage. This commit introduces this into the manpage Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

doc: typeset long command-line options as literal

2016-06-28T15:36:45Z

Similarly to the previous commit, use backquotes instead of forward-quotes, for long options. This was obtained with: perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt and manual tweak to remove false positive in ascii-art (o'--o'--o' to describe rewritten history). Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

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