aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-15 21:53:13 -0500
committerJunio C Hamano <junkio@cox.net>2006-12-15 22:31:01 -0800
commit82dca84871637ac9812c0dec27f56d07cfba524c (patch)
treef0c91933e89b1cfd95dd6368d628ce034e3df510 /Documentation
parentaeb80c70ec2baebbf107de0ea5293984798ddd24 (diff)
downloadgit-82dca84871637ac9812c0dec27f56d07cfba524c.tar.gz
git-82dca84871637ac9812c0dec27f56d07cfba524c.tar.xz
Align section headers of 'git status' to new 'git add'.
Now that 'git add' is considered a first-class UI for 'update-index' and that the 'git add' documentation states "Even modified files must be added to the set of changes about to be committed" we should make the output of 'git status' align with that documentation and common usage. So now we see a status output such as: # Added but not yet committed: # (will commit) # # new file: x # # Changed but not added: # (use "git add file1 file2" to include for commit) # # modified: x # # Untracked files: # (use "git add" on files to include for commit) # # y which just reads better in the context of using 'git add' to manipulate a commit (and not a checkin, whatever the heck that is). We also now support 'color.status.added' as an alias for the existing 'color.status.updated', as this alias more closely aligns with the current output and documentation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/git-reset.txt2
-rw-r--r--Documentation/tutorial-2.txt10
3 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8abb0820f..ceac54b02 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 73a0ffc41..4a4ceb620 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 aa62e13de..60e54777d 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.