{"thread":{"id":"21714","subject":"[PATCH 4/4] apply: Use the term \"working tree\" consistently","startedAt":"2009-11-22T19:53:29Z","lastAt":"2009-11-22T19:53:29Z","messageCount":1,"participants":["Björn Gustavsson"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"128123","messageId":"4B0996B9.8060608@gmail.com","threadId":"21714","inReplyTo":null,"subject":"[PATCH 4/4] apply: Use the term \"working tree\" consistently","fromName":"Björn Gustavsson","fromEmail":"bgustavsson@gmail.com","sentAt":"2009-11-22T19:53:29Z","receivedAt":"2009-11-22T19:53:29Z","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---\nJunio wrote that he personally would vote for changing\nit the other way around starting from the glossary.\n\n\"Work tree\" feels fine for me (and is shorter than\n\"working tree\"), but I am not a native speaker.\n\n Documentation/git-apply.txt |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 6a07ec2..c2528a7 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -51,7 +51,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@@ -59,7 +59,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"}]}