development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse source 
* sn/tutorial-status-output-example:
  gittutorial: fix output of 'git status'
This commit is contained in:
Junio C Hamano 2014-11-19 13:47:59 -08:00
parent bfd6b53aab 8942821ec0
commit eeb92d7e60
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Documentation/gittutorial-2.txt
View 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,

17
Documentation/gittutorial.txt
View 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