diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-17 09:27:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-17 09:27:06 -0700 |
| commit | 413ff100cdac43f14cbdfd5d117d9400d5adc860 (patch) | |
| tree | 142849d7c587bcd612f25fea7ad41f8312895e81 /Documentation/git-difftool.adoc | |
| parent | Merge branch 'ad/t1517-short-help-tests-fix' into next (diff) | |
| parent | doc lint: check that synopsis manpages have synopsis inlines (diff) | |
| download | git-413ff100cdac43f14cbdfd5d117d9400d5adc860.tar.gz git-413ff100cdac43f14cbdfd5d117d9400d5adc860.zip | |
Merge branch 'ja/doc-lint-sections-and-synopsis' into next
Doc lint updates to encourage the newer and easier-to-use
`synopsis` format, with fixes to a handful of existing uses.
* ja/doc-lint-sections-and-synopsis:
doc lint: check that synopsis manpages have synopsis inlines
doc:git-for-each-ref: fix styling and typos
doc: check for absence of the form --[no-]parameter
doc: check for absence of multiple terms in each entry of desc list
doc: check well-formedness of delimited sections
doc: test linkgit macros for well-formedness
Diffstat (limited to 'Documentation/git-difftool.adoc')
| -rw-r--r-- | Documentation/git-difftool.adoc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-difftool.adoc b/Documentation/git-difftool.adoc index d596205eaf..064bc68347 100644 --- a/Documentation/git-difftool.adoc +++ b/Documentation/git-difftool.adoc @@ -77,7 +77,8 @@ 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`. ---[no-]symlinks:: +--symlinks:: +--no-symlinks:: 'git difftool''s default behavior is to create symlinks to the working tree when run in `--dir-diff` mode and the right-hand side of the comparison yields the same content as the file in @@ -94,7 +95,8 @@ instead. `--no-symlinks` is the default on Windows. Additionally, `$BASE` is set in the environment. -g:: ---[no-]gui:: +--gui:: +--no-gui:: When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. This may be @@ -104,7 +106,8 @@ instead. `--no-symlinks` is the default on Windows. fallback in the order of `merge.guitool`, `diff.tool`, `merge.tool` until a tool is found. ---[no-]trust-exit-code:: +--trust-exit-code:: +--no-trust-exit-code:: Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code. |