diff options
| author |  Stefan Naewe <stefan.naewe@gmail.com> | 2014-11-13 10:40:07 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-11-13 10:53:50 -0800 |
| commit | 8942821ec046238b6cea12e6dd4dfa7ba51c133e (patch) | |
| tree | d73fe315e9318e9f331ce8a7fc69ae91a39012e4 | |
| parent | Merge branch 'nd/gitignore-trailing-whitespace' into maint (diff) | |
| download | tgif-8942821ec046238b6cea12e6dd4dfa7ba51c133e.tar.xz | |
gittutorial: fix output of 'git status'
'git status' doesn't output leading '#'s these days.
Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/gittutorial-2.txt | 23 | ||||
| -rw-r--r-- | Documentation/gittutorial.txt | 17 |
2 files changed, 21 insertions, 19 deletions
diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt index 3109ea8aad..24318a0b11 100644 --- a/Documentation/gittutorial-2.txt +++ b/Documentation/gittutorial-2.txt @@ -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, diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index 8262196318..5dab0f8161 100644 --- a/Documentation/gittutorial.txt +++ b/Documentation/gittutorial.txt @@ -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 |