From 8942821ec046238b6cea12e6dd4dfa7ba51c133e Mon Sep 17 00:00:00 2001 From: Stefan Naewe Date: Thu, 13 Nov 2014 10:40:07 +0000 Subject: [PATCH 1/1] gittutorial: fix output of 'git status' 'git status' doesn't output leading '#'s these days. Signed-off-by: Stefan Naewe Signed-off-by: Junio C Hamano --- Documentation/gittutorial-2.txt | 23 ++++++++++++----------- 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 ..." to unstage) -# -# new file: closing.txt -# -# Changes not staged for commit: -# (use "git add ..." to update what will be committed) -# -# modified: file.txt -# +On branch master +Changes to be committed: + (use "git reset HEAD ..." to unstage) + + new file: closing.txt + +Changes not staged for commit: + (use "git add ..." to update what will be committed) + (use "git checkout -- ..." 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 ..." 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 ..." to unstage) + + modified: file1 + modified: file2 + modified: file3 + ------------------------------------------------ If you need to make any further adjustments, do so now, and then add any -- 2.47.1