@@ -1 +1,2 @@
hello world!
+hello world, again
-$ git update-index file.txt
+$ git add file.txt
$ git diff
------------------------------------------------
hello world, again
------------------------------------------------
-So what our "git update-index" did was store a new blob and then put
+So what our "git add" did was store a new blob and then put
a reference to it in the index file. If we modify the file again,
we'll see that the new modifications are reflected in the "git-diff"
output:
------------------------------------------------
$ 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.
should be able to find any unknown jargon in the
link:glossary.html[Glossary].
+The link:user-manual.html[Git User's Manual] provides a more
+comprehensive introduction to git.
+
The link:cvs-migration.html[CVS migration] document explains how to
import a CVS repository into git, and shows how to use git in a
CVS-like way.