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>
Markus Heidelberg committed
Dec 19, 2008 at 13:14 UTC
ec9f0ea3e6ecf1237223dec8428e7bb73d339320
4 files changed
+9
-11
Documentation/git-checkout.txt
-1
@@ -232,7 +232,6 @@ the `-m` option, you would see something like this:
232
------------
233
$ git checkout -m mytopic
234
Auto-merging frotz
235
-merge: warning: conflicts during merge
235
ERROR: Merge conflict in frotz
236
fatal: merge program failed
237
------------
Documentation/git-reset.txt
+1
-1
@@ -130,7 +130,7 @@ Undo a merge or pull::
130
$ git pull <1>
131
Auto-merging nitfol
132
CONFLICT (content): Merge conflict in nitfol
133
-Automatic merge failed/prevented; fix up by hand
133
+Automatic merge failed; fix conflicts and then commit the result.
134
$ git reset --hard <2>
135
$ git pull . topic/branch <3>
136
Updating from 41223... to 13134...
Documentation/gitcore-tutorial.txt
+5
-6
@@ -899,7 +899,7 @@ file, which had no differences in the `mybranch` branch), and say:
899
----------------
900
Auto-merging hello
901
CONFLICT (content): Merge conflict in hello
902
- Automatic merge failed; fix up by hand
902
+ Automatic merge failed; fix conflicts and then commit the result.
903
----------------
904
905
It tells you that it did an "Automatic merge", which
@@ -993,7 +993,7 @@ would be different)
993
994
----------------
995
Updating from ae3a2da... to a80b4aa....
996
-Fast forward
996
+Fast forward (no commit created; -m option ignored)
997
example | 1 +
998
hello | 1 +
999
2 files changed, 2 insertions(+), 0 deletions(-)
@@ -1265,9 +1265,8 @@ file, using 3-way merge. This is done by giving
1265
1266
------------
1267
$ git merge-index git-merge-one-file hello
1268
-Auto-merging hello.
1269
-merge: warning: conflicts during merge
1270
-ERROR: Merge conflict in hello.
1268
+Auto-merging hello
1269
+ERROR: Merge conflict in hello
1270
fatal: merge program failed
1271
------------
1272
@@ -1447,7 +1446,7 @@ public repository you might want to repack & prune often, or
1446
never.
1447
1448
If you run `git repack` again at this point, it will say
1450
-"Nothing to pack". Once you continue your development and
1449
+"Nothing new to pack.". Once you continue your development and
1450
accumulate the changes, running `git repack` again will create a
1451
new pack, that contains objects created since you packed your
1452
repository the last time. We recommend that you pack your project
Documentation/pretty-formats.txt
+3
-3
@@ -30,7 +30,7 @@ This is designed to be as compact as possible.
30
31
commit <sha1>
32
Author: <author>
33
- Date: <author date>
33
+ Date: <author date>
34
35
<title line>
36
@@ -49,9 +49,9 @@ This is designed to be as compact as possible.
49
* 'fuller'
50
51
commit <sha1>
52
- Author: <author>
52
+ Author: <author>
53
AuthorDate: <author date>
54
- Commit: <committer>
54
+ Commit: <committer>
55
CommitDate: <committer date>
56
57
<title line>