1
0
mirror of https://github.com/git/git.git synced 2024-10-21 08:08:16 +02:00

completion: add git config am.threeWay completion

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rikard Falkeborn 2017-05-27 08:25:49 +02:00 committed by Junio C Hamano
parent f254eab2e0
commit e8dec56770

@ -2343,6 +2343,7 @@ _git_config ()
advice.statusHints
alias.
am.keepcr
am.threeWay
apply.ignorewhitespace
apply.whitespace
branch.autosetupmerge