Thread (47 messages) flat view 47 messages, 8 authors, 2016-06-15

Re: [PATCH v3] git-add--interactive: manual hunk editing mode

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:44:43

Hi,

On Mon, 9 Jun 2008, Jeff King wrote:
On Mon, Jun 09, 2008 at 07:46:22AM +0200, Johan Herland wrote:

And I was hoping the right way to do it was to simply build the 
interactive "e" command on top of Johannes' git-apply work. But I don't 
think that quite makes sense. His work is about fixing up the hunk 
header as we apply the patch, but a working "e" command in the hunk 
selection should probably not actually apply, but simply split into two 
hunks for the loop.
Well, maybe I am silly, but I thought that the idea with add -i (e) was 
to split off the first part, ask the user if that should be applied, and 
then go on with the rest.

But like I said, Junio convinced me that it makes not much sense to split 
somewhere else than common lines, and you have that already with the "s" 
command in add -i.

In any case, I am happy with "add -e", even more so than I though I would 
be, and therefore I do not need add -i (e).  Thus, I will just shut up and 
let you guys work it out.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help