From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Nov 2014 21:47:59 +0000 (-0800)
Subject: Merge branch 'sn/tutorial-status-output-example'
X-Git-Tag: v2.2.0-rc3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eeb92d7e60d64c55cb6c766158dd078c905c95e0?ds=inline;hp=-c

Merge branch 'sn/tutorial-status-output-example'

* sn/tutorial-status-output-example:
gittutorial: fix output of 'git status'
---

eeb92d7e60d64c55cb6c766158dd078c905c95e0
diff --combined Documentation/gittutorial-2.txt
index f6fbf814fb,24318a0b11..30d2119565
--- a/Documentation/gittutorial-2.txt
+++ b/Documentation/gittutorial-2.txt
@@@ -368,17 -368,18 +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,
@@@ -403,7 -404,7 +404,7 @@@ What next
  
  At this point you should know everything necessary to read the man
  pages for any of the git commands; one good place to start would be
 -with the commands mentioned in link:everyday.html[Everyday Git].  You
 +with the commands mentioned in linkgit:giteveryday[7].  You
  should be able to find any unknown jargon in linkgit:gitglossary[7].
  
  The link:user-manual.html[Git User's Manual] provides a more
@@@ -427,7 -428,7 +428,7 @@@ linkgit:gitcvs-migration[7]
  linkgit:gitcore-tutorial[7],
  linkgit:gitglossary[7],
  linkgit:git-help[1],
 -link:everyday.html[Everyday Git],
 +linkgit:giteveryday[7],
  link:user-manual.html[The Git User's Manual]
  
  GIT
diff --combined Documentation/gittutorial.txt
index 710e6364ea,5dab0f8161..b00c67df46
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@@ -3,7 -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 +107,15 @@@ summary of the situation with 'git stat
  
  ------------------------------------------------
  $ 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
@@@ -656,7 -657,7 +657,7 @@@ digressions that may be interesting at 
    * linkgit:gitworkflows[7]: Gives an overview of recommended
      workflows.
  
 -  * link:everyday.html[Everyday Git with 20 Commands Or So]
 +  * linkgit:giteveryday[7]: Everyday Git with 20 Commands Or So.
  
    * linkgit:gitcvs-migration[7]: Git for CVS users.
  
@@@ -668,7 -669,7 +669,7 @@@ linkgit:gitcore-tutorial[7]
  linkgit:gitglossary[7],
  linkgit:git-help[1],
  linkgit:gitworkflows[7],
 -link:everyday.html[Everyday Git],
 +linkgit:giteveryday[7],
  link:user-manual.html[The Git User's Manual]
  
  GIT