Merge branch 'kk/maint-commit-tree' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:05:13 +0000 (13:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:05:13 +0000 (13:05 -0700)
commit2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8
treefdea44aea763a0dfa6c68f905101c892a2e65aad
parent70f6be7aa9a1f435d64df11ec92ff84982bfc581
parent4b7518a4aa24339d53e04151ba6b337245527c03
Merge branch 'kk/maint-commit-tree' into maint

"git commit-tree" learned a more natural "-p <parent> <tree>" order
of arguments long time ago, but recently forgot it by mistake.

* kk/maint-commit-tree:
  Revert "git-commit-tree(1): update synopsis"
  commit-tree: resurrect command line parsing updates