gittutorial: fix output of 'git status'
authorStefan Naewe <stefan.naewe@gmail.com>
Thu, 13 Nov 2014 10:40:07 +0000 (10:40 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2014 18:53:50 +0000 (10:53 -0800)
'git status' doesn't output leading '#'s these days.

Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gittutorial-2.txt
Documentation/gittutorial.txt
index 3109ea8aade1ceb47de67823388d865a1505e616..24318a0b11e56787151ab852272dd586c507fc19 100644 (file)
@@ -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,
index 82621963189d1800087c8eca63add642c0743a96..5dab0f8161ec9424567bab6576948a2afca4c5c7 100644 (file)
@@ -107,14 +107,15 @@ summary of the situation with 'git status':
 
 ------------------------------------------------
 $ git status
-# On branch master
-# Changes to be committed:
-#   (use "git reset HEAD <file>..." to unstage)
-#
-#      modified:   file1
-#      modified:   file2
-#      modified:   file3
-#
+On branch master
+Changes to be committed:
+Your branch is up-to-date with 'origin/master'.
+  (use "git reset HEAD <file>..." to unstage)
+
+       modified:   file1
+       modified:   file2
+       modified:   file3
+
 ------------------------------------------------
 
 If you need to make any further adjustments, do so now, and then add any