![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 15 Jan 2007 05:31:30 +0000 (21:31 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 15 Jan 2007 05:31:30 +0000 (21:31 -0800) | ||
| commit | 5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1 | |
| tree | 79abb4eb4861b14908459862a792febb9123e5f7 | tree | snapshot |
| parent | e7eb50347bba54ab52f9740a3bbb6e833bdadf6e | commit | diff |
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>
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>
| Documentation/core-tutorial.txt | diff | blob | history | |
| Documentation/git-reset.txt | diff | blob | history |