Skip to content

Commit

Permalink
Tutorial-2: Adjust git-status output to recent reality.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Feb 3, 2007
1 parent 953202a commit bf3478d
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions Documentation/tutorial-2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit bf3478d

Please sign in to comment.