Skip to content

Commit eeb92d7

Browse files
committed
Merge branch 'sn/tutorial-status-output-example'
* sn/tutorial-status-output-example: gittutorial: fix output of 'git status'
2 parents bfd6b53 + 8942821 commit eeb92d7

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

Documentation/gittutorial-2.txt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -368,17 +368,18 @@ situation:
368368

369369
------------------------------------------------
370370
$ git status
371-
# On branch master
372-
# Changes to be committed:
373-
# (use "git reset HEAD <file>..." to unstage)
374-
#
375-
# new file: closing.txt
376-
#
377-
# Changes not staged for commit:
378-
# (use "git add <file>..." to update what will be committed)
379-
#
380-
# modified: file.txt
381-
#
371+
On branch master
372+
Changes to be committed:
373+
(use "git reset HEAD <file>..." to unstage)
374+
375+
new file: closing.txt
376+
377+
Changes not staged for commit:
378+
(use "git add <file>..." to update what will be committed)
379+
(use "git checkout -- <file>..." to discard changes in working directory)
380+
381+
modified: file.txt
382+
382383
------------------------------------------------
383384

384385
Since the current state of closing.txt is cached in the index file,

Documentation/gittutorial.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,15 @@ summary of the situation with 'git status':
107107

108108
------------------------------------------------
109109
$ git status
110-
# On branch master
111-
# Changes to be committed:
112-
# (use "git reset HEAD <file>..." to unstage)
113-
#
114-
# modified: file1
115-
# modified: file2
116-
# modified: file3
117-
#
110+
On branch master
111+
Changes to be committed:
112+
Your branch is up-to-date with 'origin/master'.
113+
(use "git reset HEAD <file>..." to unstage)
114+
115+
modified: file1
116+
modified: file2
117+
modified: file3
118+
118119
------------------------------------------------
119120

120121
If you need to make any further adjustments, do so now, and then add any

0 commit comments

Comments
 (0)