Documentation: sync example output with git output

Don't confuse the user with old git messages.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 79824f4819863577fbc1a313e82c739d59ea3a0e..9cd51514dbfd987db4423e254e8bab7284352525 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -232,7 +232,6 @@ the `-m` option, you would see something like this:
 ------------
 $ git checkout -m mytopic
 Auto-merging frotz
 ------------
 $ git checkout -m mytopic
 Auto-merging frotz

-merge: warning: conflicts during merge

 ERROR: Merge conflict in frotz
 fatal: merge program failed
 ------------
 ERROR: Merge conflict in frotz
 fatal: merge program failed
 ------------

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 29156f6c3cabd4a015fdf77e04bff3c448e3a66e..2049f3d97b67adc8fa93ca462875db6e522e1923 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -130,7 +130,7 @@ Undo a merge or pull::
 $ git pull                         <1>
 Auto-merging nitfol
 CONFLICT (content): Merge conflict in nitfol
 $ git pull                         <1>
 Auto-merging nitfol
 CONFLICT (content): Merge conflict in nitfol

-Automatic merge failed/prevented; fix up by hand
+Automatic merge failed; fix conflicts and then commit the result.

 $ git reset --hard                 <2>
 $ git pull . topic/branch          <3>
 Updating from 41223... to 13134...
 $ git reset --hard                 <2>
 $ git pull . topic/branch          <3>
 Updating from 41223... to 13134...

diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 96bf353d13663c33fcd072796f4a65a531f201b2..df48045ef61fa1565bb1af1eb1b165b2f2dad8f8 100644 (file)
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -899,7 +899,7 @@ file, which had no differences in the `mybranch` branch), and say:
 ----------------
        Auto-merging hello
        CONFLICT (content): Merge conflict in hello
 ----------------
        Auto-merging hello
        CONFLICT (content): Merge conflict in hello

-       Automatic merge failed; fix up by hand
+       Automatic merge failed; fix conflicts and then commit the result.

 ----------------
 
 It tells you that it did an "Automatic merge", which
 ----------------
 
 It tells you that it did an "Automatic merge", which


@@ -993,7 +993,7 @@ would be different)
 
 ----------------
 Updating from ae3a2da... to a80b4aa....
 
 ----------------
 Updating from ae3a2da... to a80b4aa....

-Fast forward
+Fast forward (no commit created; -m option ignored)

  example |    1 +
  hello   |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
  example |    1 +
  hello   |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)


@@ -1265,9 +1265,8 @@ file, using 3-way merge.  This is done by giving
 
 ------------
 $ git merge-index git-merge-one-file hello
 
 ------------
 $ git merge-index git-merge-one-file hello

-Auto-merging hello.
-merge: warning: conflicts during merge
-ERROR: Merge conflict in hello.
+Auto-merging hello
+ERROR: Merge conflict in hello

 fatal: merge program failed
 ------------
 
 fatal: merge program failed
 ------------
 


@@ -1447,7 +1446,7 @@ public repository you might want to repack & prune often, or
 never.
 
 If you run `git repack` again at this point, it will say
 never.
 
 If you run `git repack` again at this point, it will say

-"Nothing to pack". Once you continue your development and
+"Nothing new to pack.". Once you continue your development and

 accumulate the changes, running `git repack` again will create a
 new pack, that contains objects created since you packed your
 repository the last time. We recommend that you pack your project
 accumulate the changes, running `git repack` again will create a
 new pack, that contains objects created since you packed your
 repository the last time. We recommend that you pack your project

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index f18d33e00b7166104a200fbeaa854fb911273931..0a8a948e6ffba9d15b5db03399f74ed0139394ea 100644 (file)
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -30,7 +30,7 @@ This is designed to be as compact as possible.
 
          commit <sha1>
          Author: <author>
 
          commit <sha1>
          Author: <author>

-         Date: <author date>
+         Date:   <author date>

 
              <title line>
 
 
              <title line>
 


@@ -49,9 +49,9 @@ This is designed to be as compact as possible.
 * 'fuller'
 
          commit <sha1>
 * 'fuller'
 
          commit <sha1>

-         Author: <author>
+         Author:     <author>

          AuthorDate: <author date>
          AuthorDate: <author date>

-         Commit: <committer>
+         Commit:     <committer>

          CommitDate: <committer date>
 
               <title line>
          CommitDate: <committer date>
 
               <title line>