{"thread":{"id":"45673","subject":"[PATCH] worktree: change 'worktree' to 'working tree' in help text","startedAt":"2017-04-12T14:02:22Z","lastAt":"2017-04-12T14:02:22Z","messageCount":1,"participants":["Nguyễn Thái Ngọc Duy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"316690","messageId":"20170412140153.30196-1-pclouds@gmail.com","threadId":"45673","inReplyTo":null,"subject":"[PATCH] worktree: change 'worktree' to 'working tree' in help text","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2017-04-12T14:01:53Z","receivedAt":"2017-04-12T14:02:22Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"We have been trying to keep the terminology consistent on the\nuser-facing front. Let's keep sticking to \"working tree\".\n\nWhile at there, change 'other' to 'another'. The latter is probably more\ncorrect.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n builtin/worktree.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 3dab07c829..b8ea1ef966 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -330,7 +330,7 @@ static int add(int ac, const char **av, const char *prefix)\n \tchar *path;\n \tconst char *branch;\n \tstruct option options[] = {\n-\t\tOPT__FORCE(&opts.force, N_(\"checkout <branch> even if already checked out in other worktree\")),\n+\t\tOPT__FORCE(&opts.force, N_(\"checkout <branch> even if already checked out in another working tree\")),\n \t\tOPT_STRING('b', NULL, &opts.new_branch, N_(\"branch\"),\n \t\t\t   N_(\"create a new branch\")),\n \t\tOPT_STRING('B', NULL, &new_branch_force, N_(\"branch\"),\n-- \n2.11.0.157.gd943d85\n\n"}]}