From: Junio C Hamano Date: Sun, 19 Oct 2008 23:07:29 +0000 (-0700) Subject: Merge branch 'sh/maint-rebase3' X-Git-Tag: v1.6.1-rc1~125 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=310237b9698219f58cb9dedd7cd9a3a968e1a196;p=git.git Merge branch 'sh/maint-rebase3' * sh/maint-rebase3: rebase--interactive: fix parent rewriting for dropped commits --- 310237b9698219f58cb9dedd7cd9a3a968e1a196