diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-19 13:47:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-19 13:47:59 -0800 |
| commit | eeb92d7e60d64c55cb6c766158dd078c905c95e0 (patch) | |
| tree | 11e28ebfa3a2f212d90f1a1045c400d849a994f6 | |
| parent | bfd6b53aabade9865717e0afbfabfe85ba6c3055 (diff) | |
| parent | 8942821ec046238b6cea12e6dd4dfa7ba51c133e (diff) | |
| download | git-eeb92d7e60d64c55cb6c766158dd078c905c95e0.tar.gz | |
Merge branch 'sn/tutorial-status-output-example'
* sn/tutorial-status-output-example:
gittutorial: fix output of 'git status'
| -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 f6fbf814fb..30d2119565 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 710e6364ea..b00c67df46 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 |