From: Sverre Hvammen Johansen <hvammen@gmail.com>
Date: Sun, 16 Mar 2008 06:44:48 GMT
Subject: Re: [RFC/PATCH] Fast forward strategies allow, never, and only
Message-ID: <402c10cd0803152344h3fb6781fxd8e6375c8491f8a1@mail.gmail.com>
In-Reply-To: <402c10cd0803112246q4ec98018pe9a34b95e32cf1@mail.gmail.com>

On Tue, Mar 11, 2008 at 9:46 PM, Sverre Hvammen Johansen
<hvammen@gmail.com> wrote:
>  To me it makes sense that a squash oweride the ff options instead
>  of giving a error, but specifying a ff option after --squash is an error.

After some consideration I am convinced we should allow --squash
combined with any of the --ff options.  The same for --no-commit.
--squash combined with any of the --ff options means that the index
and the tree will only be updated if a merge without --squash would
have done the same.

That mean that t7600-merge.sh will break as follows:

* FAIL 19: combining --squash and --no-ff is refused

                test_must_fail git merge --squash --no-ff c1 &&
                test_must_fail git merge --no-ff --squash c1

-- 
Sverre Hvammen Johansen