summaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-14 23:01:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-14 23:01:41 (GMT)
commit8775279891fd186ce847b7ddb7f0ac2339504300 (patch)
tree521a06bf41d0afc9881553ddaf8ba8e56a7d1254 /contrib/completion/git-completion.bash
parent074d162eff7487c9e296124510147d3856029f5a (diff)
parent53204061acbf7a03a6ba050f381e0bf9b01e3a78 (diff)
downloadgit-8775279891fd186ce847b7ddb7f0ac2339504300.zip
git-8775279891fd186ce847b7ddb7f0ac2339504300.tar.gz
git-8775279891fd186ce847b7ddb7f0ac2339504300.tar.bz2
Merge branch 'jn/mergetool-hideresolved-is-optional'
Disable the recent mergetool's hideresolved feature by default for backward compatibility and safety. * jn/mergetool-hideresolved-is-optional: doc: describe mergetool configuration in git-mergetool(1) mergetool: do not enable hideResolved by default
Diffstat (limited to 'contrib/completion/git-completion.bash')
0 files changed, 0 insertions, 0 deletions