Re: [PATCH 4/5] git-merge: add support for --commit

From: Lars Hjemli <hjemli@gmail.com>
Date: Sep 23, 2007, 10:35 UTC
Message-ID: <8c5c35580709230335w2b4dcfe8xa05d50312cc2f6c3@mail.gmail.com>
In-Reply-To: <7vir62dx0u.fsf@gitster.siamese.dyndns.org>

On 9/23/07, Junio C Hamano <gitster@pobox.com> wrote:

Show 10 quoted lines

> Lars Hjemli <hjemli@gmail.com> writes:
>
> > This option can be used to override --no-commit and --squash. The change
> > also introduces slightly different behavior for --no-commit: when specified,
> > it explicitly overrides --squash.
>
> Makes me wonder if --no-squash also make sense to override a --squash.
> Is this really needed?  IOW, does it ever make sense to have --no-commit
> in the configuration?
>

Actually, I did add --no-squash but the semantics (and implementation) was identical to --commit so I decided it wasn't worth it (but maybe it is - just to avoid user confusion?).

-- 
larsh