git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv2] Do not autosquash in case of an implied interactive rebase

From
Junio C Hamano <gitster@pobox.com>
Date
May 29, 2012, 18:41 UTC
Message-ID
<7vvcje4ypl.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4FC3428F.4060202@lyx.org>
Vincent van Ravesteijn <vfr@lyx.org> writes:
Show 13 quoted lines
> 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".
Previous: Vincent van RavesteijnNext: Junio C Hamano
Message 5 of 6 in “Do not autosquash in case of an implied interactive rebase”
  1. Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn, May 24, 2012
  2. [PATCHv2] Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn, May 24, 2012
  3. Junio C HamanoMay 25, 2012
  4. Vincent van RavesteijnMay 28, 2012
  5. Junio C HamanoMay 29, 2012
  6. Junio C HamanoMay 29, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.