summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:40 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:40 -0700
commit89aef71d0eb5b5e06216c2efbba76cffe17679f7 (patch)
treed3ee647c47e5c6a33ad892a06a9b1d32beed36f9
parent1729853432011faa51a88ab9831dc9b382a6ee7e (diff)
parent2a0e6cdedab306eccbd297c051035c13d0266343 (diff)
downloadgit-89aef71d0eb5b5e06216c2efbba76cffe17679f7.tar.gz
Merge branch 'lv/status-say-working-tree-not-directory' into maint
"git status" used to say "working directory" when it meant "working tree". * lv/status-say-working-tree-not-directory: Use "working tree" instead of "working directory" for git status
-rw-r--r--wt-status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index 4f27bd62af..4ce4e35ac3 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1554,7 +1554,7 @@ void wt_status_print(struct wt_status *s)
else
printf(_("nothing to commit\n"));
} else
- printf(_("nothing to commit, working directory clean\n"));
+ printf(_("nothing to commit, working tree clean\n"));
}
}