From: Junio C Hamano Date: Thu, 22 Jun 2006 09:29:58 +0000 (-0700) Subject: Merge branch 'ew/rebase' into next X-Git-Tag: v1.4.1-rc1~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8ca3fbd462f94b980af828528c8f1fa59601b57;p=thirdparty%2Fgit.git Merge branch 'ew/rebase' into next * ew/rebase: rebase --merge: fix for rebasing more than 7 commits. --- b8ca3fbd462f94b980af828528c8f1fa59601b57