Re: [PATCH v2] bash: add missing 'git merge' options

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 17, 2009, 02:24 UTC
Message-ID: <7vmyclby2b.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090216155646.GB18525@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> writes:

Show 12 quoted lines

> 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>

Thanks, both.