Merge branch 'sh/maint-rebase3'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 23:07:29 +0000 (16:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 23:07:29 +0000 (16:07 -0700)
commit310237b9698219f58cb9dedd7cd9a3a968e1a196
treec41e2ef769ba2da5d0e1ec055584140c1a35620b
parent310d188f7e1d1fbbeace17d5c62e422fd0b5a824
parentfaae853ca622844cbb2982700c43ee9b2d93a2c0
Merge branch 'sh/maint-rebase3'

* sh/maint-rebase3:
  rebase--interactive: fix parent rewriting for dropped commits
git-rebase--interactive.sh