{"thread":{"id":"41218","subject":"[PATCH] Consistent usage of working tree in the git-add help","startedAt":"2016-01-19T18:53:55Z","lastAt":"2016-01-21T09:56:18Z","messageCount":3,"participants":["Lars Vogel","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"276356","messageId":"1453229636-16269-1-git-send-email-Lars.Vogel@vogella.com","threadId":"41218","inReplyTo":null,"subject":"[PATCH] Consistent usage of working tree in the git-add help","fromName":"Lars Vogel","fromEmail":"lars.vogel@gmail.com","sentAt":"2016-01-19T18:53:55Z","receivedAt":"2016-01-19T18:53:55Z","isPatch":true,"sender":{"key":"lars.vogel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/139910?v=4"},"body":"The usage of working directory is inconsistent in the git add help.\nAlso http://git-scm.com/docs/giit-clone speaks only about working tree.\nRemaining entry found by \"git grep -B1 '^directory' git-add.txt\" really\nrelates to a directory.\n\nSigned-off-by: Lars Vogel \n---\n Documentation/git-add.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex fe5282f..cfef77b 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -24,7 +24,7 @@ remove paths that do not exist in the working tree anymore.\n \n The \"index\" holds a snapshot of the content of the working tree, and it\n is this snapshot that is taken as the contents of the next commit. Thus\n-after making any changes to the working directory, and before running\n+after making any changes to the working tree, and before running\n the commit command, you must use the `add` command to add any new or\n modified files to the index.\n \n@@ -85,7 +85,7 @@ OPTIONS\n -p::\n --patch::\n \tInteractively choose hunks of patch between the index and the\n-\twork tree and add them to the index. This gives the user a chance\n+\tworking tree and add them to the index. This gives the user a chance\n \tto review the difference before adding modified contents to the\n \tindex.\n +\n-- \n2.7.0\n"},{"id":"276478","messageId":"xmqqr3hb22zu.fsf@gitster.mtv.corp.google.com","threadId":"41218","inReplyTo":"1453229636-16269-1-git-send-email-Lars.Vogel@vogella.com","subject":"Re: [PATCH] Consistent usage of working tree in the git-add help","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-01-21T00:24:53Z","receivedAt":"2016-01-21T00:24:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lars Vogel writes:\n\n> The usage of working directory is inconsistent in the git add help.\n> Also http://git-scm.com/docs/giit-clone speaks only about working tree.\n> Remaining entry found by \"git grep -B1 '^directory' git-add.txt\" really\n> relates to a directory.\n>\n> Signed-off-by: Lars Vogel \n> ---\n> Documentation/git-add.txt | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\n> index fe5282f..cfef77b 100644\n> --- a/Documentation/git-add.txt\n> +++ b/Documentation/git-add.txt\n> @@ -24,7 +24,7 @@ remove paths that do not exist in the working tree anymore.\n> \n> The \"index\" holds a snapshot of the content of the working tree, and it\n> is this snapshot that is taken as the contents of the next commit. Thus\n> -after making any changes to the working directory, and before running\n> +after making any changes to the working tree, and before running\n> the commit command, you must use the `add` command to add any new or\n> modified files to the index.\n> \n> @@ -85,7 +85,7 @@ OPTIONS\n> -p::\n> --patch::\n> \tInteractively choose hunks of patch between the index and the\n> -\twork tree and add them to the index. This gives the user a chance\n> +\tworking tree and add them to the index. This gives the user a chance\n> \tto review the difference before adding modified contents to the\n> \tindex.\n> +\n\nThanks. While the first hunk looks to me a definite improvement, I\nam lukewarm about s/work tree/working tree/ change. Both terms are\nused fairly commonly in our documentation set. \"Work tree\" has ~70\nhits vs ~350 for \"working tree\" (ignoring the case where these words\nare split across lines, i.e. \"work/working\" at the end of the line\nfollowed by a line that begins with \"tree\").\n"},{"id":"276492","messageId":"CACA4a_FtcJEPPEKDRqHFn_vtnPQfcFqN9uPChug=Fwh8B5bM3Q@mail.gmail.com","threadId":"41218","inReplyTo":"xmqqr3hb22zu.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] Consistent usage of working tree in the git-add help","fromName":"Lars Vogel","fromEmail":"lars.vogel@vogella.com","sentAt":"2016-01-21T09:56:18Z","receivedAt":"2016-01-21T09:56:18Z","isPatch":true,"sender":{"key":"lars.vogel@vogella.com","avatar":"https://gravatar.com/avatar/5e501b3827120cf228798a08717c5eed466d50fa22b12a8ce82ea15ce11cc38d?d=mp&s=160"},"body":"Thanks Junio for the feedback. I send a new patch with only the first change.\n\nOn Thu, Jan 21, 2016 at 1:24 AM, Junio C Hamano wrote:\n> Lars Vogel writes:\n>\n>> The usage of working directory is inconsistent in the git add help.\n>> Also http://git-scm.com/docs/giit-clone speaks only about working tree.\n>> Remaining entry found by \"git grep -B1 '^directory' git-add.txt\" really\n>> relates to a directory.\n>>\n>> Signed-off-by: Lars Vogel \n>> ---\n>> Documentation/git-add.txt | 4 ++--\n>> 1 file changed, 2 insertions(+), 2 deletions(-)\n>>\n>> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\n>> index fe5282f..cfef77b 100644\n>> --- a/Documentation/git-add.txt\n>> +++ b/Documentation/git-add.txt\n>> @@ -24,7 +24,7 @@ remove paths that do not exist in the working tree anymore.\n>>\n>> The \"index\" holds a snapshot of the content of the working tree, and it\n>> is this snapshot that is taken as the contents of the next commit. Thus\n>> -after making any changes to the working directory, and before running\n>> +after making any changes to the working tree, and before running\n>> the commit command, you must use the `add` command to add any new or\n>> modified files to the index.\n>>\n>> @@ -85,7 +85,7 @@ OPTIONS\n>> -p::\n>> --patch::\n>> Interactively choose hunks of patch between the index and the\n>> - work tree and add them to the index. This gives the user a chance\n>> + working tree and add them to the index. This gives the user a chance\n>> to review the difference before adding modified contents to the\n>> index.\n>> +\n>\n> Thanks. While the first hunk looks to me a definite improvement, I\n> am lukewarm about s/work tree/working tree/ change. Both terms are\n> used fairly commonly in our documentation set. \"Work tree\" has ~70\n> hits vs ~350 for \"working tree\" (ignoring the case where these words\n> are split across lines, i.e. \"work/working\" at the end of the line\n> followed by a line that begins with \"tree\").\n\n\n\n-- \nEclipse Platform UI and e4 project co-lead\nCEO vogella GmbH\n\nHaindaalwisch 17a, 22395 Hamburg\nAmtsgericht Hamburg: HRB 127058\nGeschäftsführer: Lars Vogel, Jennifer Nerlich de Vogel\nUSt-IdNr.: DE284122352\nFax (040) 5247 6322, Email: lars.vogel@vogella.com, Web: http://www.vogella.com\n"}]}