{"thread":{"id":"10706","subject":"[PATCH] Fix mistakes in the documentation of git-add --interactive.","startedAt":"2007-11-07T18:20:03Z","lastAt":"2007-11-07T22:31:08Z","messageCount":7,"participants":["Benoit Sigoure","Michele Ballabio","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"58708","messageId":"1194459603-7988-1-git-send-email-tsuna@lrde.epita.fr","threadId":"10706","inReplyTo":null,"subject":"[PATCH] Fix mistakes in the documentation of git-add --interactive.","fromName":"Benoit Sigoure","fromEmail":"tsuna@lrde.epita.fr","sentAt":"2007-11-07T18:20:03Z","receivedAt":"2007-11-07T18:20:03Z","isPatch":true,"sender":{"key":"tsunanet@gmail.com","avatar":"https://avatars.githubusercontent.com/u/128281?v=4"},"body":"This patch fixes a couple of language issues in the documentation\nof the `patch' sub-command of git-add --interactive.\n\nSigned-off-by: Benoit Sigoure \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 963e1ab..f7c02ff 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -202,8 +202,8 @@ patch::\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+ a - add the change from that hunk and all the remaining ones\n+ d - do not the add change from that hunk and skip the remaining ones\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@@ -211,8 +211,8 @@ patch::\n undecided hunk\n K - do not decide on this hunk now, and view the previous hunk\n +\n-After deciding the fate for all hunks, if there is any hunk\n-that was chosen, the index is updated with the selected hunks.\n+After deciding the fate of each hunk, the index is updated with the selected\n+ones.\n \n diff::\n \n-- \n1.5.3.4.398.g859b\n"},{"id":"58722","messageId":"200711072150.18751.barra_cuda@katamail.com","threadId":"10706","inReplyTo":"1194459603-7988-1-git-send-email-tsuna@lrde.epita.fr","subject":"Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2007-11-07T20:50:18Z","receivedAt":"2007-11-07T20:50:18Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"On Wednesday 07 November 2007, Benoit Sigoure wrote:\n> +       d - do not the add change from that hunk and skip the remaining ones\n add the\n ^^^^^^^\nSwap these :)\n"},{"id":"58733","messageId":"93628C2D-F574-4621-BA4F-DE9E31A45264@lrde.epita.fr","threadId":"10706","inReplyTo":"200711072150.18751.barra_cuda@katamail.com","subject":"Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.","fromName":"Benoit Sigoure","fromEmail":"tsuna@lrde.epita.fr","sentAt":"2007-11-07T21:59:58Z","receivedAt":"2007-11-07T21:59:58Z","isPatch":true,"sender":{"key":"tsunanet@gmail.com","avatar":"https://avatars.githubusercontent.com/u/128281?v=4"},"body":"On Nov 7, 2007, at 9:50 PM, Michele Ballabio wrote:\n\n> On Wednesday 07 November 2007, Benoit Sigoure wrote:\n>> + d - do not the add change from that hunk and skip the \n>> remaining ones\n> add the\n> ^^^^^^^\n> Swap these :)\n\nOuch, indeed ;o\n\n-- \nBenoit Sigoure aka Tsuna\nEPITA Research and Development Laboratory\n\n\n"},{"id":"58734","messageId":"1194472947-8601-1-git-send-email-tsuna@lrde.epita.fr","threadId":"10706","inReplyTo":"200711072150.18751.barra_cuda@katamail.com","subject":"[PATCH] Fix mistakes in the documentation of git-add --interactive.","fromName":"Benoit Sigoure","fromEmail":"tsuna@lrde.epita.fr","sentAt":"2007-11-07T22:02:27Z","receivedAt":"2007-11-07T22:02:27Z","isPatch":true,"sender":{"key":"tsunanet@gmail.com","avatar":"https://avatars.githubusercontent.com/u/128281?v=4"},"body":"This patch fixes a couple of language issues in the documentation\nof the `patch' sub-command of git-add --interactive.\n\nSigned-off-by: Benoit Sigoure \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 963e1ab..f7c02ff 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -202,8 +202,8 @@ patch::\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+ a - add the change from that hunk and all the remaining ones\n+ d - do not the add change from that hunk and skip the remaining ones\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@@ -211,8 +211,8 @@ patch::\n undecided hunk\n K - do not decide on this hunk now, and view the previous hunk\n +\n-After deciding the fate for all hunks, if there is any hunk\n-that was chosen, the index is updated with the selected hunks.\n+After deciding the fate of each hunk, the index is updated with the selected\n+ones.\n \n diff::\n \n-- \n1.5.3.4.398.g859b\n"},{"id":"58739","messageId":"Pine.LNX.4.64.0711072224200.4362@racer.site","threadId":"10706","inReplyTo":"1194472947-8601-1-git-send-email-tsuna@lrde.epita.fr","subject":"Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-11-07T22:25:12Z","receivedAt":"2007-11-07T22:25:12Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 7 Nov 2007, Benoit Sigoure wrote:\n\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> + a - add the change from that hunk and all the remaining ones\n> + d - do not the add change from that hunk and skip the remaining ones\n\nThis still sounds funny. How about\n\n\td - skip this hunk, as well as the remaining ones\n\nHmm?\n\nCiao,\nDscho\n"},{"id":"58741","messageId":"73D3EECD-2164-4D9F-A2AA-91BEC7F34F22@lrde.epita.fr","threadId":"10706","inReplyTo":"Pine.LNX.4.64.0711072224200.4362@racer.site","subject":"Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.","fromName":"Benoit Sigoure","fromEmail":"tsuna@lrde.epita.fr","sentAt":"2007-11-07T22:28:49Z","receivedAt":"2007-11-07T22:28:49Z","isPatch":true,"sender":{"key":"tsunanet@gmail.com","avatar":"https://avatars.githubusercontent.com/u/128281?v=4"},"body":"On Nov 7, 2007, at 11:25 PM, Johannes Schindelin wrote:\n\n> Hi,\n>\n> On Wed, 7 Nov 2007, Benoit Sigoure wrote:\n>\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 \n>> to index\n>> + a - add the change from that hunk and all the remaining ones\n>> + d - do not the add change from that hunk and skip the \n>> remaining ones\n>\n> This still sounds funny. How about\n>\n> \td - skip this hunk, as well as the remaining ones\n\nYup, that's better, indeed. I'll post a v3 (:\n\n-- \nBenoit Sigoure aka Tsuna\nEPITA Research and Development Laboratory\n\n\n"},{"id":"58742","messageId":"1194474668-8837-1-git-send-email-tsuna@lrde.epita.fr","threadId":"10706","inReplyTo":"Pine.LNX.4.64.0711072224200.4362@racer.site","subject":"[PATCH v3] Fix mistakes in the documentation of git-add --interactive.","fromName":"Benoit Sigoure","fromEmail":"tsuna@lrde.epita.fr","sentAt":"2007-11-07T22:31:08Z","receivedAt":"2007-11-07T22:31:08Z","isPatch":true,"sender":{"key":"tsunanet@gmail.com","avatar":"https://avatars.githubusercontent.com/u/128281?v=4"},"body":"This patch fixes a couple of language issues in the documentation\nof the `patch' sub-command of git-add --interactive.\n\nSigned-off-by: Benoit Sigoure \n---\nUse better wording proposed by Dscho.\n\n Documentation/git-add.txt | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 963e1ab..3117798 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -201,9 +201,9 @@ patch::\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+ n - skip this hunk\n+ a - add the change from that hunk and all the remaining ones\n+ d - skip this hunk, as well as the remaining ones\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@@ -211,8 +211,8 @@ patch::\n undecided hunk\n K - do not decide on this hunk now, and view the previous hunk\n +\n-After deciding the fate for all hunks, if there is any hunk\n-that was chosen, the index is updated with the selected hunks.\n+After deciding the fate of each hunk, the index is updated with the selected\n+ones.\n \n diff::\n \n-- \n1.5.3.4.398.g859b\n"}]}