mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'sn/tutorial-status-output-example'
* sn/tutorial-status-output-example: gittutorial: fix output of 'git status'
This commit is contained in:
commit
eeb92d7e60
|
@ -368,17 +368,18 @@ situation:
|
||||||
|
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
$ git status
|
$ git status
|
||||||
# On branch master
|
On branch master
|
||||||
# Changes to be committed:
|
Changes to be committed:
|
||||||
# (use "git reset HEAD <file>..." to unstage)
|
(use "git reset HEAD <file>..." to unstage)
|
||||||
#
|
|
||||||
# new file: closing.txt
|
new file: closing.txt
|
||||||
#
|
|
||||||
# Changes not staged for commit:
|
Changes not staged for commit:
|
||||||
# (use "git add <file>..." to update what will be committed)
|
(use "git add <file>..." to update what will be committed)
|
||||||
#
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
||||||
# modified: file.txt
|
|
||||||
#
|
modified: file.txt
|
||||||
|
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
Since the current state of closing.txt is cached in the index file,
|
Since the current state of closing.txt is cached in the index file,
|
||||||
|
|
|
@ -107,14 +107,15 @@ summary of the situation with 'git status':
|
||||||
|
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
$ git status
|
$ git status
|
||||||
# On branch master
|
On branch master
|
||||||
# Changes to be committed:
|
Changes to be committed:
|
||||||
# (use "git reset HEAD <file>..." to unstage)
|
Your branch is up-to-date with 'origin/master'.
|
||||||
#
|
(use "git reset HEAD <file>..." to unstage)
|
||||||
# modified: file1
|
|
||||||
# modified: file2
|
modified: file1
|
||||||
# modified: file3
|
modified: file2
|
||||||
#
|
modified: file3
|
||||||
|
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
If you need to make any further adjustments, do so now, and then add any
|
If you need to make any further adjustments, do so now, and then add any
|
||||||
|
|
Loading…
Reference in a new issue