# [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive. 4 messages from 2008-03-07 to 2008-03-13. Participants: Vineet Kumar, Junio C Hamano. Thread: https://gitlist.dev/t/12568 ## Vineet Kumar, 2008-03-07 22:16 Subject: [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive. Message-ID: <1204928211-7168-1-git-send-email-vineet@doorstop.net> URL: https://gitlist.dev/e/1204928211-7168-1-git-send-email-vineet%40doorstop.net ``` There were some inconsistent mixing of "this hunk" and "that hunk" referring to the same hunk; I switched them all to "this". There was also a missing "the". --- Documentation/git-add.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 4779909..bc74fc0 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -207,10 +207,10 @@ patch:: and the working tree file and asks you if you want to stage the change of each hunk. You can say: - y - add the change from that hunk to index - n - do not add the change from that hunk to index - a - add the change from that hunk and all the rest to index - d - do not the change from that hunk nor any of the rest to index + y - add the change from this hunk to index + n - do not add the change from this hunk to index + a - add the change from this hunk and all the rest to index + d - do not add the change from this hunk nor any of the rest to index j - do not decide on this hunk now, and view the next undecided hunk J - do not decide on this hunk now, and view the next hunk -- 1.5.3.7 ``` ## Junio C Hamano, 2008-03-07 23:47 Subject: Re: [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive. Message-ID: <7vk5ke14hp.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vk5ke14hp.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1204928211-7168-1-git-send-email-vineet@doorstop.net> ``` Vineet Kumar writes: > There were some inconsistent mixing of "this hunk" and "that hunk" referring > to the same hunk; I switched them all to "this". There was also a missing > "the". > --- > Documentation/git-add.txt | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt > index 4779909..bc74fc0 100644 > --- a/Documentation/git-add.txt > +++ b/Documentation/git-add.txt > @@ -207,10 +207,10 @@ patch:: > and the working tree file and asks you if you want to stage > the change of each hunk. You can say: > > - y - add the change from that hunk to index > - n - do not add the change from that hunk to index > - a - add the change from that hunk and all the rest to index > - d - do not the change from that hunk nor any of the rest to index > + y - add the change from this hunk to index > + n - do not add the change from this hunk to index > + a - add the change from this hunk and all the rest to index > + d - do not add the change from this hunk nor any of the rest to index > j - do not decide on this hunk now, and view the next > undecided hunk > J - do not decide on this hunk now, and view the next hunk Hmm. Do we perhaps want to match this with the help text in "sub help_patch_cmd" of git-add--interactive.perl? ``` ## Vineet Kumar, 2008-03-10 15:47 Subject: Re: [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive. Message-ID: <20080310154719.GA11449@doorstop.net> URL: https://gitlist.dev/e/20080310154719.GA11449%40doorstop.net In-Reply-To: <7vk5ke14hp.fsf@gitster.siamese.dyndns.org> ``` * Junio C Hamano (gitster@pobox.com) [080307 16:05]: > Vineet Kumar writes: > > > There were some inconsistent mixing of "this hunk" and "that hunk" referring > > to the same hunk; I switched them all to "this". There was also a missing > > "the". > > --- > > Documentation/git-add.txt | 8 ++++---- > > 1 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt > > index 4779909..bc74fc0 100644 > > --- a/Documentation/git-add.txt > > +++ b/Documentation/git-add.txt > > @@ -207,10 +207,10 @@ patch:: > > and the working tree file and asks you if you want to stage > > the change of each hunk. You can say: > > > > - y - add the change from that hunk to index > > - n - do not add the change from that hunk to index > > - a - add the change from that hunk and all the rest to index > > - d - do not the change from that hunk nor any of the rest to index > > + y - add the change from this hunk to index > > + n - do not add the change from this hunk to index > > + a - add the change from this hunk and all the rest to index > > + d - do not add the change from this hunk nor any of the rest to index > > j - do not decide on this hunk now, and view the next > > undecided hunk > > J - do not decide on this hunk now, and view the next hunk > > Hmm. Do we perhaps want to match this with the help text in > "sub help_patch_cmd" of git-add--interactive.perl? Yeah, personally I like those ones better; I think they're more readable. Any ideas on how to have them use the same source, or should I just duplicate the ones from git-add--interactive.perl into git-add.txt? Vineet -- http://www.doorstop.net/ ``` ## Vineet Kumar, 2008-03-13 18:32 Subject: [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive. Message-ID: <1205433136-32734-1-git-send-email-vineet@doorstop.net> URL: https://gitlist.dev/e/1205433136-32734-1-git-send-email-vineet%40doorstop.net In-Reply-To: <20080310154719.GA11449@doorstop.net> ``` The wording of the interactive help text from git-add--interactive.perl is clearer. Just duplicate that text here. Signed-off-by: Vineet Kumar --- Documentation/git-add.txt | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 4779909..c751a17 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -207,16 +207,14 @@ patch:: and the working tree file and asks you if you want to stage the change of each hunk. You can say: - y - add the change from that hunk to index - n - do not add the change from that hunk to index - a - add the change from that hunk and all the rest to index - d - do not the change from that hunk nor any of the rest to index - j - do not decide on this hunk now, and view the next - undecided hunk - J - do not decide on this hunk now, and view the next hunk - k - do not decide on this hunk now, and view the previous - undecided hunk - K - do not decide on this hunk now, and view the previous hunk + y - stage this hunk + n - do not stage this hunk + a - stage this and all the remaining hunks in the file + d - do not stage this hunk nor any of the remaining hunks in the file + 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 ? - print help + -- 1.5.4.2 ```