threads / patch / 10706

patchFix mistakes in the documentation of git-add --interactive.

Subject: [PATCH] Fix mistakes in the documentation of git-add --interactive.

## tl;dr

7 messages between Nov 7, 2007 and Nov 7, 2007. Diffs are folded; open one to read it.

replies: 6people: 3as markdown or json

Benoit Sigoure· Nov 7, 2007, 18:20 UTC · lore

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 <tsuna@lrde.epita.fr>
---
 Documentation/git-add.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Show changes to Documentation/git-add.txt +4 −4

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· Nov 7, 2007, 20:50 UTC · re: Benoit Sigoure · lore

Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.

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· Nov 7, 2007, 21:59 UTC · re: Michele Ballabio · lore

Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.

On Nov 7, 2007, at 9:50 PM, Michele Ballabio wrote:

Show 6 quoted lines

> 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· Nov 7, 2007, 22:02 UTC · re: Michele Ballabio · lore

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 <tsuna@lrde.epita.fr>
---
 Documentation/git-add.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Show changes to Documentation/git-add.txt +4 −4

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· Nov 7, 2007, 22:25 UTC · re: Benoit Sigoure · lore

Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.

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· Nov 7, 2007, 22:28 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Fix mistakes in the documentation of git-add --interactive.

On Nov 7, 2007, at 11:25 PM, Johannes Schindelin wrote:

Show 14 quoted lines

> 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· Nov 7, 2007, 22:31 UTC · re: Johannes Schindelin · lore

[PATCH v3] Fix mistakes in the documentation of git-add --interactive.

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 <tsuna@lrde.epita.fr>
---
Use better wording proposed by Dscho.

 Documentation/git-add.txt |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Show changes to Documentation/git-add.txt +5 −5

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