Make default merge messages denser.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 17:09:41 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 17:09:41 +0000 (10:09 -0700)
commit5b1ea09de1eb2ae190169ca77e16a79de0e1ede7
tree8816f2fc9f59db7206eecb59b8fda3ad08e77cf1
parent4e7346735aaf0e0d15f0b18023ac21d983b9fd83
Make default merge messages denser.

In particular, make them readable on one line since that's what all the
tools like git-shortlog and gitk end up showing.
git-pull-script
git-resolve-script