All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] worktree: change 'worktree' to 'working tree' in help text
@ 2017-04-12 14:01 Nguyễn Thái Ngọc Duy
  0 siblings, 0 replies; only message in thread
From: Nguyễn Thái Ngọc Duy @ 2017-04-12 14:01 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Nguyễn Thái Ngọc Duy

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 <pclouds@gmail.com>
---
 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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-04-12 14:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-12 14:01 [PATCH] worktree: change 'worktree' to 'working tree' in help text Nguyễn Thái Ngọc Duy

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.