summaryrefslogtreecommitdiff
path: root/Documentation/gittutorial-2.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-19 21:47:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-19 21:47:59 (GMT)
commiteeb92d7e60d64c55cb6c766158dd078c905c95e0 (patch)
tree11e28ebfa3a2f212d90f1a1045c400d849a994f6 /Documentation/gittutorial-2.txt
parentbfd6b53aabade9865717e0afbfabfe85ba6c3055 (diff)
parent8942821ec046238b6cea12e6dd4dfa7ba51c133e (diff)
downloadgit-eeb92d7e60d64c55cb6c766158dd078c905c95e0.zip
git-eeb92d7e60d64c55cb6c766158dd078c905c95e0.tar.gz
git-eeb92d7e60d64c55cb6c766158dd078c905c95e0.tar.bz2
Merge branch 'sn/tutorial-status-output-example'
* sn/tutorial-status-output-example: gittutorial: fix output of 'git status'
Diffstat (limited to 'Documentation/gittutorial-2.txt')
-rw-r--r--Documentation/gittutorial-2.txt23
1 files changed, 12 insertions, 11 deletions
diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt
index f6fbf81..30d2119 100644
--- a/Documentation/gittutorial-2.txt
+++ b/Documentation/gittutorial-2.txt
@@ -368,17 +368,18 @@ situation:
------------------------------------------------
$ git status
-# On branch master
-# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
-#
-# new file: closing.txt
-#
-# Changes not staged for commit:
-# (use "git add <file>..." to update what will be committed)
-#
-# modified: file.txt
-#
+On branch master
+Changes to be committed:
+ (use "git reset HEAD <file>..." to unstage)
+
+ new file: closing.txt
+
+Changes not staged for commit:
+ (use "git add <file>..." to update what will be committed)
+ (use "git checkout -- <file>..." to discard changes in working directory)
+
+ modified: file.txt
+
------------------------------------------------
Since the current state of closing.txt is cached in the index file,