From: Rikard Falkeborn Date: Sat, 27 May 2017 06:25:49 GMT Subject: [PATCH 3/6] completion: Add git config am.threeWay completion Message-ID: <20170527062552.13996-4-rikard.falkeborn@gmail.com> In-Reply-To: <20170527062552.13996-1-rikard.falkeborn@gmail.com> Signed-off-by: Rikard Falkeborn --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index de9306173..3a630a230 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2344,6 +2344,7 @@ _git_config () advice.statusHints alias. am.keepcr + am.threeWay apply.ignorewhitespace apply.whitespace branch.autosetupmerge -- 2.13.0