Tutorial-2: Adjust git-status output to recent reality.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-02-02 22:55:07 -08:00
Родитель 953202a3fd
Коммит bf3478de97
1 изменённых файлов: 7 добавлений и 8 удалений

Просмотреть файл

@ -352,24 +352,23 @@ situation:
------------------------------------------------
$ git status
#
# Added but not yet committed:
# (will commit)
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: closing.txt
#
#
# Changed but not added:
# (use "git add file1 file2" to include for commit)
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: file.txt
#
------------------------------------------------
Since the current state of closing.txt is cached in the index file,
it is listed as "added but not yet committed". Since file.txt has
it is listed as "Changes to be committed". Since file.txt has
changes in the working directory that aren't reflected in the index,
it is marked "changed but not added". At this point, running "git
it is marked "changed but not updated". 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.