aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRikard Falkeborn <rikard.falkeborn@gmail.com>2017-05-27 08:25:49 +0200
committerJunio C Hamano <gitster@pobox.com>2017-06-02 11:25:26 +0900
commite8dec567705ebeaaff70bb29bd9f724944c5ae90 (patch)
treec00071e43ab2d487679bb9191242ed8cf01212aa /contrib
parentf254eab2e024edec8b8d4a342252efba74901fdb (diff)
downloadgit-e8dec567705ebeaaff70bb29bd9f724944c5ae90.tar.gz
git-e8dec567705ebeaaff70bb29bd9f724944c5ae90.tar.xz
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>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3e6ddaa81..615079038 100644
--- 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