Code

Make "pretty" commit logs always show merge information
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 20:52:05 +0000 (13:52 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 20:52:05 +0000 (13:52 -0700)
commit28342a5d328fa11829dbe883837e21e08dd83388
treec58a7f7c4b45af2f4cb4583749522692ecec75c2
parent8b3a1e056f2107deedfdada86046971c9ad7bb87
Make "pretty" commit logs always show merge information

Otherwise the "git log" information doesn't tell enough to make sense of
a merge.

I'll need to add some parent information for regular entries too, I
think, but the merge is more important.
commit.c