diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-15 05:31:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-15 05:31:30 (GMT) |
| commit | 5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1 (patch) | |
| tree | 79abb4eb4861b14908459862a792febb9123e5f7 /Documentation/git-reset.txt | |
| parent | e7eb50347bba54ab52f9740a3bbb6e833bdadf6e (diff) | |
| download | git-5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1.zip git-5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1.tar.gz git-5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1.tar.bz2 | |
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/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 4f42478..04475a9 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 |