summaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2021-03-13 08:41:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-13 23:34:32 (GMT)
commit53204061acbf7a03a6ba050f381e0bf9b01e3a78 (patch)
treee088bf64e8c9a853d09cf05b1f0f279cd1944a7f /contrib/completion/git-completion.bash
parentb2a51c1b03c44bd888e2f65c764dced571266482 (diff)
downloadgit-53204061acbf7a03a6ba050f381e0bf9b01e3a78.zip
git-53204061acbf7a03a6ba050f381e0bf9b01e3a78.tar.gz
git-53204061acbf7a03a6ba050f381e0bf9b01e3a78.tar.bz2
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 <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion/git-completion.bash')
0 files changed, 0 insertions, 0 deletions