tree 04aec50dfbd0a1870b1bdd81cb3bd5707e36636b
parent 8ec7e19499a5885ba1bfe14bc7e8110774ce1dee
parent 5887ac821f9df614cfcf3349960523e1c36f2de7
author Junio C Hamano <junkio@cox.net> 1150968598 -0700
committer Junio C Hamano <junkio@cox.net> 1150968598 -0700

Merge branch 'ew/rebase' into next

* ew/rebase:
  rebase --merge: fix for rebasing more than 7 commits.