{"thread":{"id":"12568","subject":"[PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive.","startedAt":"2008-03-07T22:16:51Z","lastAt":"2008-03-13T18:32:16Z","messageCount":4,"participants":["Vineet Kumar","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"71386","messageId":"1204928211-7168-1-git-send-email-vineet@doorstop.net","threadId":"12568","inReplyTo":null,"subject":"[PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive.","fromName":"Vineet Kumar","fromEmail":"vineet@doorstop.net","sentAt":"2008-03-07T22:16:51Z","receivedAt":"2008-03-07T22:16:51Z","isPatch":true,"sender":{"key":"vineet@doorstop.net","avatar":"https://gravatar.com/avatar/7eaf4d9b5b3c6cadffd6515fb81ede43381557eaad3e58c7140ff1fc5ccb41dd?d=mp&s=160"},"body":"There were some inconsistent mixing of \"this hunk\" and \"that hunk\" referring\nto the same hunk; I switched them all to \"this\". There was also a missing\n\"the\".\n---\n Documentation/git-add.txt | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 4779909..bc74fc0 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -207,10 +207,10 @@ patch::\n and the working tree file and asks you if you want to stage\n the change of each hunk. You can say:\n \n- y - add the change from that hunk to index\n- n - do not add the change from that hunk to index\n- a - add the change from that hunk and all the rest to index\n- d - do not the change from that hunk nor any of the rest to index\n+ y - add the change from this hunk to index\n+ n - do not add the change from this hunk to index\n+ a - add the change from this hunk and all the rest to index\n+ d - do not add the change from this hunk nor any of the rest to index\n j - do not decide on this hunk now, and view the next\n undecided hunk\n J - do not decide on this hunk now, and view the next hunk\n-- \n1.5.3.7\n\n"},{"id":"71388","messageId":"7vk5ke14hp.fsf@gitster.siamese.dyndns.org","threadId":"12568","inReplyTo":"1204928211-7168-1-git-send-email-vineet@doorstop.net","subject":"Re: [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-07T23:47:14Z","receivedAt":"2008-03-07T23:47:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Vineet Kumar writes:\n\n> There were some inconsistent mixing of \"this hunk\" and \"that hunk\" referring\n> to the same hunk; I switched them all to \"this\". There was also a missing\n> \"the\".\n> ---\n> Documentation/git-add.txt | 8 ++++----\n> 1 files changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\n> index 4779909..bc74fc0 100644\n> --- a/Documentation/git-add.txt\n> +++ b/Documentation/git-add.txt\n> @@ -207,10 +207,10 @@ patch::\n> and the working tree file and asks you if you want to stage\n> the change of each hunk. You can say:\n> \n> - y - add the change from that hunk to index\n> - n - do not add the change from that hunk to index\n> - a - add the change from that hunk and all the rest to index\n> - d - do not the change from that hunk nor any of the rest to index\n> + y - add the change from this hunk to index\n> + n - do not add the change from this hunk to index\n> + a - add the change from this hunk and all the rest to index\n> + d - do not add the change from this hunk nor any of the rest to index\n> j - do not decide on this hunk now, and view the next\n> undecided hunk\n> J - do not decide on this hunk now, and view the next hunk\n\nHmm. Do we perhaps want to match this with the help text in\n\"sub help_patch_cmd\" of git-add--interactive.perl?\n\n"},{"id":"71595","messageId":"20080310154719.GA11449@doorstop.net","threadId":"12568","inReplyTo":"7vk5ke14hp.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive.","fromName":"Vineet Kumar","fromEmail":"vineet@doorstop.net","sentAt":"2008-03-10T15:47:19Z","receivedAt":"2008-03-10T15:47:19Z","isPatch":true,"sender":{"key":"vineet@doorstop.net","avatar":"https://gravatar.com/avatar/7eaf4d9b5b3c6cadffd6515fb81ede43381557eaad3e58c7140ff1fc5ccb41dd?d=mp&s=160"},"body":"* Junio C Hamano (gitster@pobox.com) [080307 16:05]:\n> Vineet Kumar writes:\n> \n> > There were some inconsistent mixing of \"this hunk\" and \"that hunk\" referring\n> > to the same hunk; I switched them all to \"this\". There was also a missing\n> > \"the\".\n> > ---\n> > Documentation/git-add.txt | 8 ++++----\n> > 1 files changed, 4 insertions(+), 4 deletions(-)\n> >\n> > diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\n> > index 4779909..bc74fc0 100644\n> > --- a/Documentation/git-add.txt\n> > +++ b/Documentation/git-add.txt\n> > @@ -207,10 +207,10 @@ patch::\n> > and the working tree file and asks you if you want to stage\n> > the change of each hunk. You can say:\n> > \n> > - y - add the change from that hunk to index\n> > - n - do not add the change from that hunk to index\n> > - a - add the change from that hunk and all the rest to index\n> > - d - do not the change from that hunk nor any of the rest to index\n> > + y - add the change from this hunk to index\n> > + n - do not add the change from this hunk to index\n> > + a - add the change from this hunk and all the rest to index\n> > + d - do not add the change from this hunk nor any of the rest to index\n> > j - do not decide on this hunk now, and view the next\n> > undecided hunk\n> > J - do not decide on this hunk now, and view the next hunk\n> \n> Hmm. Do we perhaps want to match this with the help text in\n> \"sub help_patch_cmd\" of git-add--interactive.perl?\n\nYeah, personally I like those ones better; I think they're more\nreadable. Any ideas on how to have them use the same source, or should\nI just duplicate the ones from git-add--interactive.perl into\ngit-add.txt?\n\nVineet\n-- \nhttp://www.doorstop.net/\n"},{"id":"71980","messageId":"1205433136-32734-1-git-send-email-vineet@doorstop.net","threadId":"12568","inReplyTo":"20080310154719.GA11449@doorstop.net","subject":"[PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive.","fromName":"Vineet Kumar","fromEmail":"vineet@doorstop.net","sentAt":"2008-03-13T18:32:16Z","receivedAt":"2008-03-13T18:32:16Z","isPatch":true,"sender":{"key":"vineet@doorstop.net","avatar":"https://gravatar.com/avatar/7eaf4d9b5b3c6cadffd6515fb81ede43381557eaad3e58c7140ff1fc5ccb41dd?d=mp&s=160"},"body":"The wording of the interactive help text from git-add--interactive.perl is\nclearer. Just duplicate that text here.\n\nSigned-off-by: Vineet Kumar \n---\n Documentation/git-add.txt | 18 ++++++++----------\n 1 files changed, 8 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 4779909..c751a17 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -207,16 +207,14 @@ patch::\n and the working tree file and asks you if you want to stage\n the change of each hunk. You can say:\n \n- y - add the change from that hunk to index\n- n - do not add the change from that hunk to index\n- a - add the change from that hunk and all the rest to index\n- d - do not the change from that hunk nor any of the rest to index\n- j - do not decide on this hunk now, and view the next\n- undecided hunk\n- J - do not decide on this hunk now, and view the next hunk\n- k - do not decide on this hunk now, and view the previous\n- undecided hunk\n- K - do not decide on this hunk now, and view the previous hunk\n+ y - stage this hunk\n+ n - do not stage this hunk\n+ a - stage this and all the remaining hunks in the file\n+ d - do not stage this hunk nor any of the remaining hunks in the file\n+ j - leave this hunk undecided, see next undecided hunk\n+ J - leave this hunk undecided, see next hunk\n+ k - leave this hunk undecided, see previous undecided hunk\n+ K - leave this hunk undecided, see previous hunk\n s - split the current hunk into smaller hunks\n ? - print help\n +\n-- \n1.5.4.2\n"}]}