Andrew's git / gitweb.git / diff
?
completion: add git config am.threeWay completion
authorRikard Falkeborn <rikard.falkeborn@gmail.com>
Sat, 27 May 2017 06:25:49 +0000 (08:25 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Jun 2017 02:25:26 +0000 (11:25 +0900)
Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash patch | blob | history
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3e6ddaa814a5c536d5110f043b3ac6472f43d0a7..6150790387ad0fee095748cd0ad657098a8019bb 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2343,6 +2343,7 @@ _git_config ()
                advice.statusHints
                alias.
                am.keepcr
+               am.threeWay
                apply.ignorewhitespace
                apply.whitespace
                branch.autosetupmerge