diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2009-02-15 14:25:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-16 14:51:24 -0800 |
| commit | d532ebd5a799fe2c991a96004bf739434e6ecaf4 (patch) | |
| tree | a2827da5d5af8d08675a013a62d863f640f20d5a /contrib | |
| parent | 1b7e543a6e2f156536a3cf227f9da1029bba6265 (diff) | |
| download | git-d532ebd5a799fe2c991a96004bf739434e6ecaf4.tar.gz git-d532ebd5a799fe2c991a96004bf739434e6ecaf4.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 412d2c0da..0bb768f1c 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1037,6 +1037,7 @@ _git_merge () --*) __gitcomp " --no-commit --no-stat --log --no-log --squash --strategy + --commit --stat --no-squash --ff --no-ff " return esac |