From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 May 2012 18:41:10 GMT
Subject: Re: [PATCHv2] Do not autosquash in case of an implied interactive rebase
Message-ID: <7vvcje4ypl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4FC3428F.4060202@lyx.org>

Vincent van Ravesteijn <vfr@lyx.org> writes:

> Op 25-5-2012 19:50, Junio C Hamano schreef:
>> Vincent van Ravesteijn<vfr@lyx.org>  writes:
>>
>>> The option to autosquash is only used in case of an interactive rebase.
>>> When merges are preserved, rebase uses an interactive rebase internally,
>>> but in this case autosquash should still be disabled.
>>>
>>> Signed-off-by: Vincent van Ravesteijn<vfr@lyx.org>
>> Hrm, what if the end user said "git rebase --autosquash -p" explicitly
>> from the command line?
>
> The option "--autosquash" is designed to have no effect whenever
> "--interactive" is not supplied.

Ahh, Ok.  I somehow thought "rebase --autosquash" implied "-i".