![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 27 Jan 2006 10:17:19 +0000 (02:17 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Jan 2006 08:09:39 +0000 (00:09 -0800) | ||
| commit | f2d4227530499db3e273ae84f30adfd4b70791c6 | |
| tree | 179ce1bc4fcbe5aa5b2dbd97622fe9a9209ab4b9 | tree | snapshot |
| parent | 3815f423ae39bf774de3c268c6d3e3b72128a4e5 | commit | diff |
pretty_print_commit: honor grafts.
When displaying Merge: lines, we used to take the real commit
parents from the commit objects. Use the parsed parents from
the commit object instead, so that we honor fake parent
information from info/grafts.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When displaying Merge: lines, we used to take the real commit
parents from the commit objects. Use the parsed parents from
the commit object instead, so that we honor fake parent
information from info/grafts.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| commit.c | diff | blob | history |