Merge branch 'jc/maint-rebase-am'
commit8876046037a3064f906d2155ea30cb6db186e409
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Apr 2008 07:25:15 +0000 (19 00:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Apr 2008 07:25:15 +0000 (19 00:25 -0700)
tree1efada90a50b0c0dd5749b361a92b44409aa1515
parentd9f39d9838f089c145817c6c0f25ffedcb1c500e
parent5e835cac8622373724235d299f1331ac4cf81ccf
Merge branch 'jc/maint-rebase-am'

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

Conflicts:

git-am.sh
git-am.sh