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/tutorial-2.txt | |
| parent | aeb80c70ec2baebbf107de0ea5293984798ddd24 (diff) | |
| download | git-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/tutorial-2.txt')
| -rw-r--r-- | Documentation/tutorial-2.txt | 10 |
1 files changed, 5 insertions, 5 deletions
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. |