Merge branch 'jc/maint-rebase-am' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Apr 2008 06:01:51 +0000 (23:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Apr 2008 06:01:51 +0000 (23:01 -0700)
commit41a3e3aa9bdaede9ab7afed206428c1b071060d2
tree5c446d5c13797b117a34c309019e0131880fb1b1
parent5634cf24766f8700804ca55f5e8567c88538a5b0
parent5e835cac8622373724235d299f1331ac4cf81ccf
Merge branch 'jc/maint-rebase-am' into maint

* jc/maint-rebase-am:
  rebase: do not munge commit log message

Conflicts:

git-am.sh
git-am.sh