Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 2/3] git-add--interactive: remove hunk coalescing

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:53

Thomas Rast [off-list ref] writes:
Junio C Hamano wrote:
quoted
quoted
Blindly concatenating the above two and feeding them to "git apply" *may*
happen to work by accident, not by design.  This very much feels like a
hack of "This works most of the time for me, your mileage may vary" kind,
which we would want to avoid when we can.
Well, I changed my mind.  Let's run with this and see what happens.
In support of this being a feature of git-apply, notice that it even
handles the situation correctly where the context of a hunk has been
influenced by previous hunks, as in...
That's what meant by my earlier "application is hunk-by-hunk in nature"
and we are in agreement.  The fact it works that way is not quite by
design and close to being "by accident", but I do not foresee anybody
changing it in the near future, so...
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help