X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Ftutorial-2.txt;h=8d899927124104d2b472f1ce63f97346a84e2d2c;hb=d77ee72662a821d66ae218056f0103eb24d8d4b4;hp=8606381e6c54b9a892802d15e5d61f4e43f9bb6d;hpb=ebd124c6783da5e064963611ee17741cd173f6b5;p=git.git diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt index 8606381e6..8d8999271 100644 --- a/Documentation/tutorial-2.txt +++ b/Documentation/tutorial-2.txt @@ -17,8 +17,8 @@ Let's start a new project and create a small amount of history: ------------------------------------------------ $ mkdir test-project $ cd test-project -$ git init-db -defaulting to local storage area +$ git init +Initialized empty Git repository in .git/ $ echo 'hello world' > file.txt $ git add . $ git commit -a -m "initial commit" @@ -343,8 +343,8 @@ And, as you can see with cat-file, this new entry refers to the current contents of the file: ------------------------------------------------ -$ git cat-file blob a6b11f7a -goodbye, word +$ git cat-file blob 8b9743b2 +goodbye, world ------------------------------------------------ The "status" command is a useful way to get a quick summary of the @@ -352,22 +352,21 @@ situation: ------------------------------------------------ $ git status -# -# Updated but not checked in: -# (will commit) +# On branch master +# Changes to be committed: +# (use "git reset HEAD ..." to unstage) # # new file: closing.txt # -# # Changed but not updated: -# (use git-update-index to mark for commit) +# (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 "updated but not checked in". 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 updated". At this point, running "git commit" would create a commit that added closing.txt (with its new