Documentation: merge-output is not too verbose now.
We've squelched output from merge-recursive, and git-merge when used with recursive does not attempt the trivial one first anymore, so there won't be "Trying ... Nope." messages now. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 14, 2007 at 21:31 UTC
5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1
2 files changed
+2
-11
Documentation/core-tutorial.txt
+2
-7
@@ -906,18 +906,13 @@ of it as it can automatically (which in this case is just merge the `example`
906
file, which had no differences in the `mybranch` branch), and say:
907
908
----------------
909
- Trying really trivial in-index merge...
910
- fatal: Merge requires file-level merging
911
- Nope.
912
- ...
909
Auto-merging hello
910
CONFLICT (content): Merge conflict in hello
911
Automatic merge failed; fix up by hand
912
----------------
913
918
-which is way too verbose, but it basically tells you that it failed the
919
-really trivial merge ("Simple merge") and did an "Automatic merge"
920
-instead, but that too failed due to conflicts in `hello`.
914
+It tells you that it did an "Automatic merge", which
915
+failed due to conflicts in `hello`.
916
917
Not to worry. It left the (trivial) conflict in `hello` in the same form you
918
should already be well used to if you've ever used CVS, so let's just
Documentation/git-reset.txt
-4
@@ -121,10 +121,6 @@ Undo a merge or pull::
121
+
122
------------
123
$ git pull <1>
124
-Trying really trivial in-index merge...
125
-fatal: Merge requires file-level merging
126
-Nope.
127
-...
124
Auto-merging nitfol
125
CONFLICT (content): Merge conflict in nitfol
126
Automatic merge failed/prevented; fix up by hand