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

Re: [PATCH] rebase -i: fix squashing corner case

From
Johannes Sixt <j.sixt@eudaptics.com>
Date
Aug 24, 2007, 07:18 UTC
Message-ID
<46CE8655.1DD79C48@eudaptics.com>
In-Reply-To
<Pine.LNX.4.64.0708222334510.20400@racer.site>
Johannes Schindelin wrote:
Show 5 quoted lines
> 
> When squashing, rebase -i did not prevent fast forwards.  This could
> happen when picking some other commit than the first one, and then
> squashing the first commit.  So do not allow fast forwards when
> squashing.
This indeed fixes the problem. Hence:
Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
Junio, please apply.
-- Hannes
Previous: Johannes Schindelin
Message 3 of 3 in “bug in rebase--interactive with squash and conflicts”
  1. Johannes SixtAug 21, 2007
  2. rebase -i: fix squashing corner caseJohannes Schindelin, Aug 23, 2007
  3. Johannes SixtAug 24, 2007

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.