undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completion: add git config am.threeWay completion

Browse Source 
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
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/completion/git-completion.bash
View File

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