git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index af9f709ccf36b37ab4b143eaad218372af3e0ee4..b00c67df46dad4efe93dddc7ead0a7422aa47c32 100644 (file)
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -3,7 +3,7 @@ gittutorial(7)
 
 NAME
 ----
-gittutorial - A tutorial introduction to Git (for version 1.5.1 or newer)
+gittutorial - A tutorial introduction to Git
 
 SYNOPSIS
 --------
@@ -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