Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Tutorial-2: Adjust git-status output to recent reality.
author
Junio C Hamano
<junkio@cox.net>
Sat, 3 Feb 2007 06:55:07 +0000
(22:55 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 3 Feb 2007 06:55:07 +0000
(22:55 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/tutorial-2.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
953202a
)
diff --git
a/Documentation/tutorial-2.txt
b/Documentation/tutorial-2.txt
index f363d17f0bedb8145f003ecef29832faf18a0730..8d899927124104d2b472f1ce63f97346a84e2d2c 100644
(file)
--- a/
Documentation/tutorial-2.txt
+++ b/
Documentation/tutorial-2.txt
@@
-352,24
+352,23
@@
situation:
------------------------------------------------
$ git status
------------------------------------------------
$ 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
#
#
# 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,
#
# 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,
changes in the working directory that aren't reflected in the index,
-it is marked "changed but not
add
ed". At this point, running "git
+it is marked "changed but not
updat
ed". 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.
commit" would create a commit that added closing.txt (with its new
contents), but that didn't modify file.txt.