public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: <stefan.naewe@atlas-elektronik•com>
Cc: <git@vger•kernel.org>, <th.acker@arcor•de>
Subject: Re: [PATCH] gittutorial: fix output of 'git status'
Date: Thu, 13 Nov 2014 08:38:54 -0800	[thread overview]
Message-ID: <xmqqppcr2gyp.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1415875207-5992-1-git-send-email-stefan.naewe@atlas-elektronik.com> (stefan naewe's message of "Thu, 13 Nov 2014 10:40:07 +0000")

<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

     prev parent reply	other threads:[~2014-11-13 16:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqppcr2gyp.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=stefan.naewe@atlas-elektronik$(echo .)com \
    --cc=th.acker@arcor$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox