Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 26 May 2006 23:36:20 +0000 (16:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 26 May 2006 23:36:20 +0000 (16:36 -0700)
* master:
  Call builtin ls-tree in git-cat-file -p
  built-in format-patch: various fixups.
  Add instructions to commit template.

1  2 
git-commit.sh

diff --cc git-commit.sh
Simple merge