diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-15 21:53:13 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-15 22:31:01 -0800 |
commit | 82dca84871637ac9812c0dec27f56d07cfba524c (patch) | |
tree | f0c91933e89b1cfd95dd6368d628ce034e3df510 /Documentation/git-reset.txt | |
parent | aeb80c70ec2baebbf107de0ea5293984798ddd24 (diff) | |
download | git-82dca84871637ac9812c0dec27f56d07cfba524c.tar.gz |
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/git-reset.txt')
-rw-r--r-- | Documentation/git-reset.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 73a0ffc410..4a4ceb6201 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:: |