Subject: [PATCH] worktree: change 'worktree' to 'working tree' in help text

From: Nguyễn Thái Ngọc Duy <[email-masked]>
Date: Wed, 12 Apr 2017 21:01:53 +0700

We have been trying to keep the terminology consistent on the
user-facing front. Let's keep sticking to "working tree".

While at there, change 'other' to 'another'. The latter is probably more
correct.

Signed-off-by: Nguyễn Thái Ngọc Duy <[email-masked]>
---
 builtin/worktree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 3dab07c829..b8ea1ef966 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -330,7 +330,7 @@ static int add(int ac, const char **av, const char *prefix)
 	char *path;
 	const char *branch;
 	struct option options[] = {
-		OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in other worktree")),
+		OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in another working tree")),
 		OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
 			   N_("create a new branch")),
 		OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
-- 
2.11.0.157.gd943d85