* [PATCH] gittutorial: fix output of 'git status' [not found] <1638160691.207203.1415866403277.JavaMail.ngmail@webmail23.arcor-online.net> @ 2014-11-13 10:40 ` stefan.naewe 2014-11-13 16:38 ` Junio C Hamano 0 siblings, 1 reply; 2+ messages in thread From: stefan.naewe @ 2014-11-13 10:40 UTC (permalink / raw) To: git; +Cc: th.acker From: Stefan Naewe <stefan.naewe@gmail•com> 'git status' doesn't output leading '#'s these days. Signed-off-by: Stefan Naewe <stefan.naewe@gmail•com> --- 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 3109ea8..1901af7 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 8262196..8715244 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 -- 1.9.2.msysgit.0.2270.g8768113 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gittutorial: fix output of 'git status' 2014-11-13 10:40 ` [PATCH] gittutorial: fix output of 'git status' stefan.naewe @ 2014-11-13 16:38 ` Junio C Hamano 0 siblings, 0 replies; 2+ messages in thread From: Junio C Hamano @ 2014-11-13 16:38 UTC (permalink / raw) To: stefan.naewe; +Cc: git, th.acker <stefan.naewe@atlas-elektronik•com> writes: > From: Stefan Naewe <stefan.naewe@gmail•com> > > 'git status' doesn't output leading '#'s these days. > > Signed-off-by: Stefan Naewe <stefan.naewe@gmail•com> > --- Thanks, will queue. > 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 3109ea8..1901af7 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 8262196..8715244 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 ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-13 16:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1638160691.207203.1415866403277.JavaMail.ngmail@webmail23.arcor-online.net>
2014-11-13 10:40 ` [PATCH] gittutorial: fix output of 'git status' stefan.naewe
2014-11-13 16:38 ` Junio C Hamano
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox