Merge branch 'jc/fetch-notags'

[git.git] / Documentation / tutorial-2.txt

diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index f363d17f0bedb8145f003ecef29832faf18a0730..af8d43bd12624ad8c539ac2dcd0c3c314e0bbff8 100644 (file)
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -227,7 +227,7 @@ $ git diff
 @@ -1 +1,2 @@
  hello world!
 +hello world, again
 @@ -1 +1,2 @@
  hello world!
 +hello world, again

-$ git update-index file.txt
+$ git add file.txt

 $ git diff
 ------------------------------------------------
 
 $ git diff
 ------------------------------------------------
 


@@ -260,7 +260,7 @@ hello world!
 hello world, again
 ------------------------------------------------
 
 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:
 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:


@@ -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 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.
 
 commit" would create a commit that added closing.txt (with its new
 contents), but that didn't modify file.txt.