![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Mon, 7 Nov 2005 23:19:44 +0000 (00:19 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 8 Nov 2005 01:13:10 +0000 (17:13 -0800) | ||
| commit | d1745afa2f062764b075300bda06aac1402dfcf6 | |
| tree | a09a7bcec1d086d584d56b1747165d1c6576ef6f | tree | snapshot |
| parent | 52963a7a3fad7f3da7b4ec49824d92338a2ab668 | commit | diff |
merge-recursive: Only print relevant rename messages
It isn't really interesting to know about the renames that have
already been committed to the branch you are working on. Furthermore,
the 'git-apply --stat' at the end of git-(merge|pull) will tell us
about any renames in the other branch.
With this commit only renames which require a file-level merge will
be printed.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
It isn't really interesting to know about the renames that have
already been committed to the branch you are working on. Furthermore,
the 'git-apply --stat' at the end of git-(merge|pull) will tell us
about any renames in the other branch.
With this commit only renames which require a file-level merge will
be printed.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-recursive.py | diff | blob | history |