bash: add missing 'git merge' options
Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'. One might wonder why add options that specify the default behaviour anyway (e.g. '--commit', '--no-squash', etc.). Users can override the default with config options (e.g. 'branch.<name>.mergeoptions', 'merge.log'), but sometimes might still need the default behaviour. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Feb 15, 2009 at 14:25 UTC
d532ebd5a799fe2c991a96004bf739434e6ecaf4
1 file changed
+1
contrib/completion/git-completion.bash
+1
@@ -1037,6 +1037,7 @@ _git_merge ()
1037
--*)
1038
__gitcomp "
1039
--no-commit --no-stat --log --no-log --squash --strategy
1040
+ --commit --stat --no-squash --ff --no-ff
1041
"
1042
return
1043
esac