delta/git.git/Documentation/git-difftool.txt, branch hv/mv-nested-submodules-test

Document the --no-gui option in difftool

2017-02-08T21:30:28+00:00

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:45+00:00

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:57+00:00

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:21+00:00

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:06+00:00

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:02+00:00

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:33+00:00

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

mergetool,difftool: Document --tool-help consistently

2012-08-10T15:07:41+00:00

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:53+00:00

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:42+00:00

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