From: Igor Djordjevic <igor.d.djordjevic@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
Git Mailing List <git@vger.kernel.org>,
Gustavo Leite <gustavoleite.ti@gmail.com>
Subject: Re: [PATCH v2 0/3] add -p: select individual hunk lines
Date: Tue, 6 Mar 2018 22:20:16 +0100 [thread overview]
Message-ID: <9e46f6c7-952f-c4d3-6a12-40c59baaa702@gmail.com> (raw)
In-Reply-To: <xmqqr2ow3ojb.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On 06/03/2018 22:03, Junio C Hamano wrote:
>
> > A small nitpick - I see you use phrasing like "select lines", where
> > the other commands usually talk about "staging", instead, so "stage
> > lines" might be more aligned with the existing text.
>
> Isn't this machinery shared across "add -p" and "reset -p"? What is
> done to the selected lines when you are using this UI while running
> "reset -p"? I hope it is not "staging". If the interface only
> "selects lines" and what is done to the selected lines depends on
> what operation is using this backend, then the current phrasing is
> perfectly fine and saying "staging" makes it actively worse.
Hmm, if that is the case, I agree, but I was merely trying to review
the files being changed - for example, inside "Documentation/git-add.txt":
y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk or any of the remaining ones
a - stage this hunk and all later hunks in the file
d - do not stage this hunk or any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help
In there, adding "l" should follow "stage" phrasing, I would think.
But you are right for "git-add--interactive.perl", for example - in
there, I didn`t notice the line (seems to be?) added inside the shared
"help_patch_cmd".
But if so, I guess it should then be moved to more context-related
"help_patch_modes", being phrased accordingly in there.
Thanks for pointing this out, let me recheck my comments.
Regards, Buga
next prev parent reply other threads:[~2018-03-06 21:20 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-19 11:36 [PATCH v1 0/3] add -p: select individual hunk lines Phillip Wood
2018-02-19 11:36 ` [PATCH v1 1/3] " Phillip Wood
2018-02-19 11:36 ` [PATCH v1 2/3] add -p: allow line selection to be inverted Phillip Wood
2018-02-19 11:36 ` [PATCH v1 3/3] add -p: optimize line selection for short hunks Phillip Wood
2018-02-19 12:20 ` [PATCH v1 0/3] add -p: select individual hunk lines Gustavo Leite
2018-03-06 10:17 ` [PATCH v2 " Phillip Wood
2018-03-06 10:17 ` [PATCH v2 1/3] " Phillip Wood
2018-03-06 20:29 ` Igor Djordjevic
2018-03-06 21:33 ` Igor Djordjevic
2018-03-06 10:17 ` [PATCH v2 2/3] add -p: allow line selection to be inverted Phillip Wood
2018-03-06 19:57 ` Junio C Hamano
2018-03-08 11:05 ` Phillip Wood
2018-03-08 17:53 ` Junio C Hamano
2018-03-13 12:06 ` Phillip Wood
2018-03-13 16:32 ` Junio C Hamano
2018-03-14 11:02 ` Phillip Wood
2018-03-06 20:41 ` Igor Djordjevic
2018-03-06 10:17 ` [PATCH v2 3/3] add -p: optimize line selection for short hunks Phillip Wood
2018-03-06 20:33 ` Igor Djordjevic
2018-03-06 20:19 ` [PATCH v2 0/3] add -p: select individual hunk lines Igor Djordjevic
2018-03-06 21:03 ` Junio C Hamano
2018-03-06 21:20 ` Igor Djordjevic [this message]
2018-03-16 10:13 ` [PATCH v3 " Phillip Wood
2018-03-16 10:13 ` [PATCH v3 1/3] " Phillip Wood
2018-03-16 10:13 ` [PATCH v3 2/3] add -p: allow line selection to be inverted Phillip Wood
2018-03-16 10:13 ` [PATCH v3 3/3] add -p: optimize line selection for short hunks Phillip Wood
2018-03-29 18:32 ` [PATCH v3 0/3] add -p: select individual hunk lines Junio C Hamano
2018-03-30 11:09 ` Phillip Wood
2018-03-31 19:20 ` Ævar Arnfjörð Bjarmason
2018-04-02 10:55 ` Phillip Wood
2018-04-02 11:39 ` Ævar Arnfjörð Bjarmason
2018-07-26 10:22 ` [RFC PATCH v4 0/4] " Phillip Wood
2018-07-26 10:22 ` [PATCH v4 1/4] " Phillip Wood
2018-07-26 10:22 ` [RFC PATCH v4 2/4] add -p: select modified lines correctly Phillip Wood
2018-07-26 10:22 ` [PATCH v4 3/4] add -p: allow line selection to be inverted Phillip Wood
2018-07-26 10:22 ` [PATCH v4 4/4] add -p: optimize line selection for short hunks Phillip Wood
2018-07-26 15:58 ` [RFC PATCH v5 0/4] add -p: select individual hunk lines Phillip Wood
2018-07-26 15:58 ` [PATCH v5 1/4] " Phillip Wood
2018-07-26 19:36 ` Junio C Hamano
2018-07-27 10:05 ` Phillip Wood
2018-07-27 16:09 ` Junio C Hamano
2018-07-26 15:58 ` [RFC PATCH v5 2/4] add -p: select modified lines correctly Phillip Wood
2018-07-26 19:30 ` Junio C Hamano
2018-07-27 10:19 ` Phillip Wood
2018-07-27 16:14 ` Junio C Hamano
2018-07-26 15:58 ` [PATCH v5 3/4] add -p: allow line selection to be inverted Phillip Wood
2018-07-26 15:58 ` [PATCH v5 4/4] add -p: optimize line selection for short hunks Phillip Wood
2018-07-27 18:27 ` [RFC PATCH v5 0/4] add -p: select individual hunk lines Ævar Arnfjörð Bjarmason
2018-07-28 10:08 ` Phillip Wood
2018-07-28 12:40 ` Ævar Arnfjörð Bjarmason
2018-08-03 10:01 ` Phillip Wood
2018-08-03 16:51 ` Junio C Hamano
2018-08-03 17:59 ` Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9e46f6c7-952f-c4d3-6a12-40c59baaa702@gmail.com \
--to=igor.d.djordjevic@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gustavoleite.ti@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).