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>
Rikard Falkeborn committed
May 27, 2017 at 08:25 UTC
e8dec567705ebeaaff70bb29bd9f724944c5ae90
1 file changed
+1
contrib/completion/git-completion.bash
+1
@@ -2343,6 +2343,7 @@ _git_config ()
2343
advice.statusHints
2344
alias.
2345
am.keepcr
2346
+ am.threeWay
2347
apply.ignorewhitespace
2348
apply.whitespace
2349
branch.autosetupmerge