[PATCH v2] bash: add missing 'git merge' options
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- Feb 15, 2009, 13:25 UTC
- Message-ID
- <1234704311-14774-1-git-send-email-szeder@ira.uka.de>
- In-Reply-To
- <7v7i3sp8jk.fsf@gitster.siamese.dyndns.org>
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> --- 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 e848d5d..98fa56e 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
-- 1.6.2.rc0.112.gc888f