diff options
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-reset.txt | 2 | ||||
| -rw-r--r-- | Documentation/tutorial-2.txt | 10 | ||||
| -rw-r--r-- | wt-status.c | 9 |
4 files changed, 13 insertions, 12 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8abb082..ceac54b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -169,8 +169,8 @@ color.status:: color.status.<slot>:: Use customized color for status colorization. `<slot>` is one of `header` (the header text of the status message), - `updated` (files which are updated but not committed), - `changed` (files which are changed but not updated in the index), + `added` or `updated` (files which are added but not committed), + `changed` (files which are changed but not added in the index), or `untracked` (files which are not tracked by git). The values of these variables may be specified as in color.diff.<slot>. diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 73a0ffc..4a4ceb6 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -31,7 +31,7 @@ OPTIONS --soft:: Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed - files "Updated but not checked in", as gitlink:git-status[1] would + files "Added but not yet committed", as gitlink:git-status[1] would put it. --hard:: diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt index aa62e13..60e5477 100644 --- a/Documentation/tutorial-2.txt +++ b/Documentation/tutorial-2.txt @@ -353,23 +353,23 @@ situation: ------------------------------------------------ $ git status # -# Updated but not checked in: +# Added but not yet committed: # (will commit) # # new file: closing.txt # # -# Changed but not updated: -# (use git-update-index to mark for commit) +# Changed but not added: +# (use "git add file1 file2" to include for commit) # # modified: file.txt # ------------------------------------------------ Since the current state of closing.txt is cached in the index file, -it is listed as "updated but not checked in". Since file.txt has +it is listed as "added but not yet committed". Since file.txt has changes in the working directory that aren't reflected in the index, -it is marked "changed but not updated". At this point, running "git +it is marked "changed but not added". At this point, running "git commit" would create a commit that added closing.txt (with its new contents), but that didn't modify file.txt. diff --git a/wt-status.c b/wt-status.c index 2173d4f..c388ce1 100644 --- a/wt-status.c +++ b/wt-status.c @@ -21,7 +21,8 @@ static int parse_status_slot(const char *var, int offset) { if (!strcasecmp(var+offset, "header")) return WT_STATUS_HEADER; - if (!strcasecmp(var+offset, "updated")) + if (!strcasecmp(var+offset, "updated") + || !strcasecmp(var+offset, "added")) return WT_STATUS_UPDATED; if (!strcasecmp(var+offset, "changed")) return WT_STATUS_CHANGED; @@ -146,7 +147,7 @@ static void wt_status_print_updated_cb(struct diff_queue_struct *q, if (q->queue[i]->status == 'U') continue; if (!shown_header) { - wt_status_print_header("Updated but not checked in", + wt_status_print_header("Added but not yet committed", "will commit"); s->commitable = 1; shown_header = 1; @@ -163,7 +164,7 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q, { int i; if (q->nr) - wt_status_print_header("Changed but not updated", use_add_msg); + wt_status_print_header("Changed but not added", use_add_msg); for (i = 0; i < q->nr; i++) wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]); if (q->nr) @@ -178,7 +179,7 @@ void wt_status_print_initial(struct wt_status *s) read_cache(); if (active_nr) { s->commitable = 1; - wt_status_print_header("Updated but not checked in", + wt_status_print_header("Added but not yet committed", "will commit"); } for (i = 0; i < active_nr; i++) { |