From: Junio C Hamano Date: Sat, 3 Feb 2007 06:55:07 +0000 (-0800) Subject: Tutorial-2: Adjust git-status output to recent reality. X-Git-Tag: v1.5.0-rc4~70 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bf3478de973607ebe5b7689fa76e05c3f344aabd;p=git.git Tutorial-2: Adjust git-status output to recent reality. Signed-off-by: Junio C Hamano --- diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt index f363d17f0..8d8999271 100644 --- a/Documentation/tutorial-2.txt +++ b/Documentation/tutorial-2.txt @@ -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 ..." 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 ..." 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.