Re: [PATCH v3 0/3] add -p: select individual hunk lines
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 29, 2018, 18:32 UTC
- Message-ID
- <xmqq1sg27mwf.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180316101346.7137-1-phillip.wood@talktalk.net>
Phillip Wood <phillip.wood@talktalk.net> writes:
Show 18 quoted lines
> From: Phillip Wood <phillip.wood@dunelm.org.uk> > > Since v2 I've updated the patches to use '-' instead of '^' to invert > the selection to match the rest of add -i and clean -i. > > These patches build on top of the recount fixes in [1]. The commit > message for the first patch describes the motivation: > > "When I end up editing hunks it is almost always because I want to > stage a subset of the lines in the hunk. Doing this by editing the > hunk is inconvenient and error prone (especially so if the patch is > going to be reversed before being applied). Instead offer an option > for add -p to stage individual lines. When the user presses 'l' the > hunk is redrawn with labels by the insertions and deletions and they > are prompted to enter a list of the lines they wish to stage. Ranges > of lines may be specified using 'a-b' where either 'a' or 'b' may be > omitted to mean all lines from 'a' to the end of the hunk or all lines > from 1 upto and including 'b'."
I haven't seen any review comments on this round, and as I am not a heavy user of "add -i" interface (even though I admit that I originally wrote it), I haven't had a chance to exercise the code myself in the two weeks since the patches have been queued in my tree.
I am inclihned to merge them to 'next' soonish, but please stop me if anybody (including the original author) has further comments.
Thanks.