{"thread":{"id":"16799","subject":"[PATCH] Documentation: sync example output with git output","startedAt":"2008-12-19T12:14:52Z","lastAt":"2008-12-19T12:14:52Z","messageCount":1,"participants":["Markus Heidelberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"98352","messageId":"200812191314.52544.markus.heidelberg@web.de","threadId":"16799","inReplyTo":null,"subject":"[PATCH] Documentation: sync example output with git output","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2008-12-19T12:14:52Z","receivedAt":"2008-12-19T12:14:52Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"Don't confuse the user with old git messages.\n\nSigned-off-by: Markus Heidelberg <markus.heidelberg@web.de>\n---\n Documentation/git-checkout.txt     |    1 -\n Documentation/git-reset.txt        |    2 +-\n Documentation/gitcore-tutorial.txt |   11 +++++------\n Documentation/pretty-formats.txt   |    6 +++---\n 4 files changed, 9 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 79824f4..9cd5151 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -232,7 +232,6 @@ the `-m` option, you would see something like this:\n ------------\n $ git checkout -m mytopic\n Auto-merging frotz\n-merge: warning: conflicts during merge\n ERROR: Merge conflict in frotz\n fatal: merge program failed\n ------------\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 29156f6..2049f3d 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -130,7 +130,7 @@ Undo a merge or pull::\n $ git pull                         <1>\n Auto-merging nitfol\n CONFLICT (content): Merge conflict in nitfol\n-Automatic merge failed/prevented; fix up by hand\n+Automatic merge failed; fix conflicts and then commit the result.\n $ git reset --hard                 <2>\n $ git pull . topic/branch          <3>\n Updating from 41223... to 13134...\ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\nindex 96bf353..df48045 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -899,7 +899,7 @@ file, which had no differences in the `mybranch` branch), and say:\n ----------------\n \tAuto-merging hello\n \tCONFLICT (content): Merge conflict in hello\n-\tAutomatic merge failed; fix up by hand\n+\tAutomatic merge failed; fix conflicts and then commit the result.\n ----------------\n \n It tells you that it did an \"Automatic merge\", which\n@@ -993,7 +993,7 @@ would be different)\n \n ----------------\n Updating from ae3a2da... to a80b4aa....\n-Fast forward\n+Fast forward (no commit created; -m option ignored)\n  example |    1 +\n  hello   |    1 +\n  2 files changed, 2 insertions(+), 0 deletions(-)\n@@ -1265,9 +1265,8 @@ file, using 3-way merge.  This is done by giving\n \n ------------\n $ git merge-index git-merge-one-file hello\n-Auto-merging hello.\n-merge: warning: conflicts during merge\n-ERROR: Merge conflict in hello.\n+Auto-merging hello\n+ERROR: Merge conflict in hello\n fatal: merge program failed\n ------------\n \n@@ -1447,7 +1446,7 @@ public repository you might want to repack & prune often, or\n never.\n \n If you run `git repack` again at this point, it will say\n-\"Nothing to pack\". Once you continue your development and\n+\"Nothing new to pack.\". Once you continue your development and\n accumulate the changes, running `git repack` again will create a\n new pack, that contains objects created since you packed your\n repository the last time. We recommend that you pack your project\ndiff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt\nindex f18d33e..0a8a948 100644\n--- a/Documentation/pretty-formats.txt\n+++ b/Documentation/pretty-formats.txt\n@@ -30,7 +30,7 @@ This is designed to be as compact as possible.\n \n \t  commit <sha1>\n \t  Author: <author>\n-\t  Date: <author date>\n+\t  Date:   <author date>\n \n \t      <title line>\n \n@@ -49,9 +49,9 @@ This is designed to be as compact as possible.\n * 'fuller'\n \n \t  commit <sha1>\n-\t  Author: <author>\n+\t  Author:     <author>\n \t  AuthorDate: <author date>\n-\t  Commit: <committer>\n+\t  Commit:     <committer>\n \t  CommitDate: <committer date>\n \n \t       <title line>\n-- \n1.6.1.rc3.27.gf650d1\n"}]}