{"thread":{"id":"21708","subject":"[PATCH 3/4] apply: Use the term \"working tree\" consistently","startedAt":"2009-11-22T16:20:21Z","lastAt":"2009-11-22T17:28:20Z","messageCount":2,"participants":["Björn Gustavsson","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"128111","messageId":"4B0964C5.7040501@gmail.com","threadId":"21708","inReplyTo":null,"subject":"[PATCH 3/4] apply: Use the term \"working tree\" consistently","fromName":"Björn Gustavsson","fromEmail":"bgustavsson@gmail.com","sentAt":"2009-11-22T16:20:21Z","receivedAt":"2009-11-22T16:20:21Z","isPatch":true,"sender":{"key":"bgustavsson@gmail.com","avatar":"https://avatars.githubusercontent.com/u/74840?v=4"},"body":"The documentation for 'git apply' uses both the terms\n\"work tree\" and \"working tree\". Since the glossary uses\nthe term \"working tree\", change all occurrences of\n\"work tree\" to \"working tree\".\n\nSigned-off-by: Björn Gustavsson <bgustavsson@gmail.com>\n---\n Documentation/git-apply.txt |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 6857a68..8349373 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -21,7 +21,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n Reads supplied 'diff' output and applies it on a git index file\n-and a work tree.\n+and a working tree.\n \n 'git-apply' can also be used outside a git repository as long\n as no options that require a git repository are given\n@@ -52,7 +52,7 @@ OPTIONS\n \n --check::\n \tInstead of applying the patch, see if the patch is\n-\tapplicable to the current work tree and/or the index\n+\tapplicable to the current working tree and/or the index\n \tfile and detects errors.  Turns off \"apply\".\n \n --index::\n@@ -60,7 +60,7 @@ OPTIONS\n \t(which is the default when none of the options that\n \tdisables it is in effect), make sure the patch is\n \tapplicable to what the current index file records.  If\n-\tthe file to be patched in the work tree is not\n+\tthe file to be patched in the working tree is not\n \tup-to-date, it is flagged as an error.  This flag also\n \tcauses the index file to be updated.\n \n-- \n1.6.5.3.298.g39add\n"},{"id":"128116","messageId":"7viqd2ii4r.fsf@alter.siamese.dyndns.org","threadId":"21708","inReplyTo":"4B0964C5.7040501@gmail.com","subject":"Re: [PATCH 3/4] apply: Use the term \"working tree\" consistently","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-11-22T17:28:20Z","receivedAt":"2009-11-22T17:28:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Björn Gustavsson <bgustavsson@gmail.com> writes:\n\n> The documentation for 'git apply' uses both the terms \"work tree\" and\n> \"working tree\". Since the glossary uses the term \"working tree\", change\n> all occurrences of \"work tree\" to \"working tree\".\n\nConsistency is good.\n\nI'd personally vote for fixing it the other way around starting from the\nglossary, though.\n"}]}