From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rebase -i: fix interrupted squashing
Date: Fri, 27 Jul 2007 18:18:32 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707271817100.14781@racer.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0707242139370.14781@racer.site>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 458 bytes --]
Hi,
On Tue, 24 Jul 2007, Johannes Schindelin wrote:
>
> 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
next prev parent reply other threads:[~2007-07-27 17:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-23 22:54 when git-rebase -i fails to cherry-pick Uwe Kleine-König
2007-07-23 23:08 ` Johannes Schindelin
2007-07-24 20:05 ` Uwe Kleine-König
2007-07-24 20:43 ` [PATCH] rebase -i: fix interrupted squashing Johannes Schindelin
2007-07-27 17:18 ` Johannes Schindelin [this message]
2007-07-27 19:20 ` Junio C Hamano
2007-07-27 19:35 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0707271817100.14781@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).