On Tue, Mar 11, 2008 at 9:46 PM, Sverre Hvammen Johansen
<hvammen@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
