From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 01 Sep 2016 13:03:39 GMT
Subject: Re: [PATCH 15/34] sequencer (rebase -i): leave a patch upon error
Message-ID: <alpine.DEB.2.20.1609011500340.129229@virtualbox>
In-Reply-To: <1472668778.4265.76.camel@kaarsemaker.net>

Hi Dennis,

On Wed, 31 Aug 2016, Dennis Kaarsemaker wrote:

> On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote:
> > Just like the interactive rebase, we want to leave a 'patch' file for
> > further inspection by the user (even if we never tried to actually apply
> > that patch, since we're cherry-picking instead).
> > 
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> This commit message confuses me. Did you mean s/Just like the/When
> doing an/? 

What I meant is this: when calling `git rebase -i` right now, i.e. before
any of my rebase--helper work, a failing rebase will leave a `patch` file
in the `.git/rebase-merge/` directory. Since the sequencer is in the
process of learning how to do an interactive rebase, it needs to learn the
same trick.

But I guess that your suggested edit makes things much clearer.

Thanks,
Dscho