Merge branch 'master' into next

* master:
Call builtin ls-tree in git-cat-file -p
built-in format-patch: various fixups.
Add instructions to commit template.

diff --cc git-commit.sh
Simple merge