mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 953202a3fd
commit bf3478de97
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/tutorial-2.txt
View File

@ -352,24 +352,23 @@ situation:
------------------------------------------------ ------------------------------------------------
$ git status $ git status
# # On branch master
# Added but not yet committed: # Changes to be committed:
# (will commit) # (use "git reset HEAD <file>..." to unstage)
# #
# new file: closing.txt # new file: closing.txt
# #
# # Changed but not updated:
# Changed but not added: # (use "git add <file>..." to update what will be committed)
# (use "git add file1 file2" to include for commit)
# #
# modified: file.txt # modified: file.txt
# #
------------------------------------------------ ------------------------------------------------
Since the current state of closing.txt is cached in the index file, 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, 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 commit" would create a commit that added closing.txt (with its new
contents), but that didn't modify file.txt. contents), but that didn't modify file.txt.