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

Re: [PATCH] rebase -i: fix interrupted squashing

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 27, 2007, 17:18 UTC
Message-ID
<Pine.LNX.4.64.0707271817100.14781@racer.site>
In-Reply-To
<Pine.LNX.4.64.0707242139370.14781@racer.site>
Hi,
On Tue, 24 Jul 2007, Johannes Schindelin wrote:
Show 5 quoted lines
> 
> When a squashing merge failed, the first commit would not be replaced,
> due to "git reset --soft" being called with an unmerged index.
> 
> Noticed by Uwe Kleine-König.
Unfortunately, no Ack from him.

However, I have tested it myself (even unwantedly, when working on the work-tree sanitising, and it bit me again; I run "master"+branch--new-workdir ATM).

Junio, please apply...

Ciao, Dscho

Previous: Johannes SchindelinNext: Junio C Hamano
Message 5 of 7 in “when git-rebase -i fails to cherry-pick”
  1. Uwe Kleine-KönigJul 23, 2007
  2. Johannes SchindelinJul 23, 2007
  3. Uwe Kleine-KönigJul 24, 2007
  4. rebase -i: fix interrupted squashingJohannes Schindelin, Jul 24, 2007
  5. Johannes SchindelinJul 27, 2007
  6. Junio C HamanoJul 27, 2007
  7. Johannes SchindelinJul 27, 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.