diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-14 21:31:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-14 21:31:30 -0800 |
| commit | 5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1 (patch) | |
| tree | 79abb4eb4861b14908459862a792febb9123e5f7 /Documentation | |
| parent | Remove hash in git-describe in favor of util slot. (diff) | |
| download | tgif-5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/core-tutorial.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-reset.txt | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 51dd6c6164..7317489cfc 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -906,18 +906,13 @@ of it as it can automatically (which in this case is just merge the `example` file, which had no differences in the `mybranch` branch), and say: ---------------- - Trying really trivial in-index merge... - fatal: Merge requires file-level merging - Nope. - ... Auto-merging hello CONFLICT (content): Merge conflict in hello Automatic merge failed; fix up by hand ---------------- -which is way too verbose, but it basically tells you that it failed the -really trivial merge ("Simple merge") and did an "Automatic merge" -instead, but that too failed due to conflicts in `hello`. +It tells you that it did an "Automatic merge", which +failed due to conflicts in `hello`. Not to worry. It left the (trivial) conflict in `hello` in the same form you should already be well used to if you've ever used CVS, so let's just diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 4f424782eb..04475a9216 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -121,10 +121,6 @@ Undo a merge or pull:: + ------------ $ git pull <1> -Trying really trivial in-index merge... -fatal: Merge requires file-level merging -Nope. -... Auto-merging nitfol CONFLICT (content): Merge conflict in nitfol Automatic merge failed/prevented; fix up by hand |