# [PATCH] Fix mistakes in the documentation of git-add --interactive. 7 messages from 2007-11-07 to 2007-11-07. Participants: Benoit Sigoure, Michele Ballabio, Johannes Schindelin. Thread: https://gitlist.dev/t/10706 ## Benoit Sigoure, 2007-11-07 18:20 Subject: [PATCH] Fix mistakes in the documentation of git-add --interactive. Message-ID: <1194459603-7988-1-git-send-email-tsuna@lrde.epita.fr> URL: https://gitlist.dev/e/1194459603-7988-1-git-send-email-tsuna%40lrde.epita.fr ``` This patch fixes a couple of language issues in the documentation of the `patch' sub-command of git-add --interactive. Signed-off-by: Benoit Sigoure --- 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 963e1ab..f7c02ff 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -202,8 +202,8 @@ patch:: 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 + a - add the change from that hunk and all the remaining ones + d - do not the add change from that hunk and skip the remaining ones 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 @@ -211,8 +211,8 @@ patch:: undecided hunk K - do not decide on this hunk now, and view the previous hunk + -After deciding the fate for all hunks, if there is any hunk -that was chosen, the index is updated with the selected hunks. +After deciding the fate of each hunk, the index is updated with the selected +ones. diff:: -- 1.5.3.4.398.g859b ``` ## Michele Ballabio, 2007-11-07 20:50 Subject: Re: [PATCH] Fix mistakes in the documentation of git-add --interactive. Message-ID: <200711072150.18751.barra_cuda@katamail.com> URL: https://gitlist.dev/e/200711072150.18751.barra_cuda%40katamail.com In-Reply-To: <1194459603-7988-1-git-send-email-tsuna@lrde.epita.fr> ``` On Wednesday 07 November 2007, Benoit Sigoure wrote: > +       d - do not the add change from that hunk and skip the remaining ones add the ^^^^^^^ Swap these :) ``` ## Benoit Sigoure, 2007-11-07 21:59 Subject: Re: [PATCH] Fix mistakes in the documentation of git-add --interactive. Message-ID: <93628C2D-F574-4621-BA4F-DE9E31A45264@lrde.epita.fr> URL: https://gitlist.dev/e/93628C2D-F574-4621-BA4F-DE9E31A45264%40lrde.epita.fr In-Reply-To: <200711072150.18751.barra_cuda@katamail.com> ``` On Nov 7, 2007, at 9:50 PM, Michele Ballabio wrote: > On Wednesday 07 November 2007, Benoit Sigoure wrote: >> + d - do not the add change from that hunk and skip the >> remaining ones > add the > ^^^^^^^ > Swap these :) Ouch, indeed ;o -- Benoit Sigoure aka Tsuna EPITA Research and Development Laboratory ``` ## Benoit Sigoure, 2007-11-07 22:02 Subject: [PATCH] Fix mistakes in the documentation of git-add --interactive. Message-ID: <1194472947-8601-1-git-send-email-tsuna@lrde.epita.fr> URL: https://gitlist.dev/e/1194472947-8601-1-git-send-email-tsuna%40lrde.epita.fr In-Reply-To: <200711072150.18751.barra_cuda@katamail.com> ``` This patch fixes a couple of language issues in the documentation of the `patch' sub-command of git-add --interactive. Signed-off-by: Benoit Sigoure --- 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 963e1ab..f7c02ff 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -202,8 +202,8 @@ patch:: 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 + a - add the change from that hunk and all the remaining ones + d - do not the add change from that hunk and skip the remaining ones 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 @@ -211,8 +211,8 @@ patch:: undecided hunk K - do not decide on this hunk now, and view the previous hunk + -After deciding the fate for all hunks, if there is any hunk -that was chosen, the index is updated with the selected hunks. +After deciding the fate of each hunk, the index is updated with the selected +ones. diff:: -- 1.5.3.4.398.g859b ``` ## Johannes Schindelin, 2007-11-07 22:25 Subject: Re: [PATCH] Fix mistakes in the documentation of git-add --interactive. Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0711072224200.4362%40racer.site In-Reply-To: <1194472947-8601-1-git-send-email-tsuna@lrde.epita.fr> ``` Hi, On Wed, 7 Nov 2007, Benoit Sigoure wrote: > - 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 > + a - add the change from that hunk and all the remaining ones > + d - do not the add change from that hunk and skip the remaining ones This still sounds funny. How about d - skip this hunk, as well as the remaining ones Hmm? Ciao, Dscho ``` ## Benoit Sigoure, 2007-11-07 22:28 Subject: Re: [PATCH] Fix mistakes in the documentation of git-add --interactive. Message-ID: <73D3EECD-2164-4D9F-A2AA-91BEC7F34F22@lrde.epita.fr> URL: https://gitlist.dev/e/73D3EECD-2164-4D9F-A2AA-91BEC7F34F22%40lrde.epita.fr In-Reply-To: ``` On Nov 7, 2007, at 11:25 PM, Johannes Schindelin wrote: > Hi, > > On Wed, 7 Nov 2007, Benoit Sigoure wrote: > >> - 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 >> + a - add the change from that hunk and all the remaining ones >> + d - do not the add change from that hunk and skip the >> remaining ones > > This still sounds funny. How about > > d - skip this hunk, as well as the remaining ones Yup, that's better, indeed. I'll post a v3 (: -- Benoit Sigoure aka Tsuna EPITA Research and Development Laboratory ``` ## Benoit Sigoure, 2007-11-07 22:31 Subject: [PATCH v3] Fix mistakes in the documentation of git-add --interactive. Message-ID: <1194474668-8837-1-git-send-email-tsuna@lrde.epita.fr> URL: https://gitlist.dev/e/1194474668-8837-1-git-send-email-tsuna%40lrde.epita.fr In-Reply-To: ``` This patch fixes a couple of language issues in the documentation of the `patch' sub-command of git-add --interactive. Signed-off-by: Benoit Sigoure --- Use better wording proposed by Dscho. Documentation/git-add.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 963e1ab..3117798 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -201,9 +201,9 @@ patch:: 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 + n - skip this hunk + a - add the change from that hunk and all the remaining ones + d - skip this hunk, as well as the remaining ones 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 @@ -211,8 +211,8 @@ patch:: undecided hunk K - do not decide on this hunk now, and view the previous hunk + -After deciding the fate for all hunks, if there is any hunk -that was chosen, the index is updated with the selected hunks. +After deciding the fate of each hunk, the index is updated with the selected +ones. diff:: -- 1.5.3.4.398.g859b ```