git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b2a51c1)
doc: describe mergetool configuration in git-mergetool(1)
authorJonathan Nieder <redacted>
Sat, 13 Mar 2021 08:41:33 +0000 (00:41 -0800)
committerJunio C Hamano <redacted>
Sat, 13 Mar 2021 23:34:32 +0000 (15:34 -0800)
commit53204061acbf7a03a6ba050f381e0bf9b01e3a78
treee088bf64e8c9a853d09cf05b1f0f279cd1944a7ftree | snapshot
parentb2a51c1b03c44bd888e2f65c764dced571266482commit | diff
doc: describe mergetool configuration in git-mergetool(1)

In particular, this describes mergetool.hideResolved, which can help
users discover this setting (either because it may be useful to them
or in order to understand mergetool's behavior if they have forgotten
setting it in the past).

Tested by running

make -C Documentation git-mergetool.1
man Documentation/git-mergetool.1

and reading through the page.

Signed-off-by: Jonathan Nieder <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-mergetool.txt diff | blob | history
git clone https://git.99rst.org/PROJECT