![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ryan Anderson <ryan@michonline.com> | |
| Tue, 4 Jul 2006 01:30:02 +0000 (21:30 -0400) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 4 Jul 2006 01:43:49 +0000 (18:43 -0700) | ||
| commit | 3f492ba1fc4e63073378cc097154bed1ed2563c8 | |
| tree | ed6ff4f8d8536c37238a32be1260ab2e248b84f4 | tree | snapshot |
| parent | f560069bc59e155c3078ba5482ce69ded68849df | commit | diff |
annotate: Correct most merge following to annotate correctly.
There is still a bug involving octopus merges, somewhere, but this gets normal
merges correct, so it's still an improvement over the existing version.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
There is still a bug involving octopus merges, somewhere, but this gets normal
merges correct, so it's still an improvement over the existing version.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-annotate.perl | diff | blob | history |