{"thread":{"id":"37950","subject":"[PATCH] gittutorial: fix output of 'git status'","startedAt":"2014-11-13T10:40:07Z","lastAt":"2014-11-13T16:38:54Z","messageCount":2,"participants":["stefan.naewe@atlas-elektronik.com","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"251797","messageId":"1415875207-5992-1-git-send-email-stefan.naewe@atlas-elektronik.com","threadId":"37950","inReplyTo":"1638160691.207203.1415866403277.JavaMail.ngmail@webmail23.arcor-online.net","subject":"[PATCH] gittutorial: fix output of 'git status'","fromName":"","fromEmail":"stefan.naewe@atlas-elektronik.com","sentAt":"2014-11-13T10:40:07Z","receivedAt":"2014-11-13T10:40:07Z","isPatch":true,"sender":{"key":"stefan.naewe@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4468?v=4"},"body":"From: Stefan Naewe <stefan.naewe@gmail.com>\n\n'git status' doesn't output leading '#'s these days.\n\nSigned-off-by: Stefan Naewe <stefan.naewe@gmail.com>\n---\n Documentation/gittutorial-2.txt | 23 ++++++++++++-----------\n Documentation/gittutorial.txt   | 17 +++++++++--------\n 2 files changed, 21 insertions(+), 19 deletions(-)\n\ndiff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt\nindex 3109ea8..1901af7 100644\n--- a/Documentation/gittutorial-2.txt\n+++ b/Documentation/gittutorial-2.txt\n@@ -368,17 +368,18 @@ situation:\n \n ------------------------------------------------\n $ git status\n-# On branch master\n-# Changes to be committed:\n-#   (use \"git reset HEAD <file>...\" to unstage)\n-#\n-#       new file: closing.txt\n-#\n-# Changes not staged for commit:\n-#   (use \"git add <file>...\" to update what will be committed)\n-#\n-#       modified: file.txt\n-#\n+On branch master\n+Changes to be committed:\n+  (use \"git reset HEAD <file>...\" to unstage)\n+\n+        new file:   closing.txt\n+\n+Changes not staged for commit:\n+  (use \"git add <file>...\" to update what will be committed)\n+  (use \"git checkout -- <file>...\" to discard changes in working directory)\n+\n+        modified:   file.txt\n+\n ------------------------------------------------\n \n Since the current state of closing.txt is cached in the index file,\ndiff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt\nindex 8262196..8715244 100644\n--- a/Documentation/gittutorial.txt\n+++ b/Documentation/gittutorial.txt\n@@ -107,14 +107,15 @@ summary of the situation with 'git status':\n \n ------------------------------------------------\n $ git status\n-# On branch master\n-# Changes to be committed:\n-#   (use \"git reset HEAD <file>...\" to unstage)\n-#\n-#\tmodified:   file1\n-#\tmodified:   file2\n-#\tmodified:   file3\n-#\n+On branch master\n+Changes to be committed:\n+Your branch is up-to-date with 'origin/master'.\n+  (use \"git reset HEAD <file>...\" to unstage)\n+\n+        modified:   file1\n+        modified:   file2\n+        modified:   file3\n+\n ------------------------------------------------\n \n If you need to make any further adjustments, do so now, and then add any\n-- \n1.9.2.msysgit.0.2270.g8768113\n"},{"id":"251825","messageId":"xmqqppcr2gyp.fsf@gitster.dls.corp.google.com","threadId":"37950","inReplyTo":"1415875207-5992-1-git-send-email-stefan.naewe@atlas-elektronik.com","subject":"Re: [PATCH] gittutorial: fix output of 'git status'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-11-13T16:38:54Z","receivedAt":"2014-11-13T16:38:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"<stefan.naewe@atlas-elektronik.com> writes:\n\n> From: Stefan Naewe <stefan.naewe@gmail.com>\n>\n> 'git status' doesn't output leading '#'s these days.\n>\n> Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>\n> ---\n\nThanks, will queue.\n\n>  Documentation/gittutorial-2.txt | 23 ++++++++++++-----------\n>  Documentation/gittutorial.txt   | 17 +++++++++--------\n>  2 files changed, 21 insertions(+), 19 deletions(-)\n>\n> diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt\n> index 3109ea8..1901af7 100644\n> --- a/Documentation/gittutorial-2.txt\n> +++ b/Documentation/gittutorial-2.txt\n> @@ -368,17 +368,18 @@ situation:\n>  \n>  ------------------------------------------------\n>  $ git status\n> -# On branch master\n> -# Changes to be committed:\n> -#   (use \"git reset HEAD <file>...\" to unstage)\n> -#\n> -#       new file: closing.txt\n> -#\n> -# Changes not staged for commit:\n> -#   (use \"git add <file>...\" to update what will be committed)\n> -#\n> -#       modified: file.txt\n> -#\n> +On branch master\n> +Changes to be committed:\n> +  (use \"git reset HEAD <file>...\" to unstage)\n> +\n> +        new file:   closing.txt\n> +\n> +Changes not staged for commit:\n> +  (use \"git add <file>...\" to update what will be committed)\n> +  (use \"git checkout -- <file>...\" to discard changes in working directory)\n> +\n> +        modified:   file.txt\n> +\n>  ------------------------------------------------\n>  \n>  Since the current state of closing.txt is cached in the index file,\n> diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt\n> index 8262196..8715244 100644\n> --- a/Documentation/gittutorial.txt\n> +++ b/Documentation/gittutorial.txt\n> @@ -107,14 +107,15 @@ summary of the situation with 'git status':\n>  \n>  ------------------------------------------------\n>  $ git status\n> -# On branch master\n> -# Changes to be committed:\n> -#   (use \"git reset HEAD <file>...\" to unstage)\n> -#\n> -#\tmodified:   file1\n> -#\tmodified:   file2\n> -#\tmodified:   file3\n> -#\n> +On branch master\n> +Changes to be committed:\n> +Your branch is up-to-date with 'origin/master'.\n> +  (use \"git reset HEAD <file>...\" to unstage)\n> +\n> +        modified:   file1\n> +        modified:   file2\n> +        modified:   file3\n> +\n>  ------------------------------------------------\n>  \n>  If you need to make any further adjustments, do so now, and then add any\n"}]}