Code

Merge branch 'ew/rebase' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 09:29:58 +0000 (02:29 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 09:29:58 +0000 (02:29 -0700)
commitb8ca3fbd462f94b980af828528c8f1fa59601b57
tree04aec50dfbd0a1870b1bdd81cb3bd5707e36636b
parent8ec7e19499a5885ba1bfe14bc7e8110774ce1dee
parent5887ac821f9df614cfcf3349960523e1c36f2de7
Merge branch 'ew/rebase' into next

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