diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-02 22:55:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-02 22:55:07 -0800 |
| commit | bf3478de973607ebe5b7689fa76e05c3f344aabd (patch) | |
| tree | 18050a0df78869140e44ad8f14310597961ff454 | |
| parent | 953202a3fd68f84210cfe9bf102c534ac3ee40e4 (diff) | |
| download | git-bf3478de973607ebe5b7689fa76e05c3f344aabd.tar.gz git-bf3478de973607ebe5b7689fa76e05c3f344aabd.tar.xz | |
Tutorial-2: Adjust git-status output to recent reality.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/tutorial-2.txt | 15 |
1 files changed, 7 insertions, 8 deletions
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 <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. |