From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 16 Feb 2009 15:56:46 GMT
Subject: Re: [PATCH v2] bash: add missing 'git merge' options
Message-ID: <20090216155646.GB18525@spearce.org>
In-Reply-To: <1234704311-14774-1-git-send-email-szeder@ira.uka.de>

SZEDER Gábor <szeder@ira.uka.de> wrote:
> 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>

>  contrib/completion/git-completion.bash |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

-- 
Shawn.