Merge branch 'dp/maint-rebase-fix' into maint
commitea2408bfe18b4f9d1eaa9d8587c5ae6196552cac
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 02:53:25 +0000 (18 19:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 02:53:25 +0000 (18 19:53 -0700)
treea1794cb4bef2c8267ee365df5f78c51d5a61ce63
parent2ba3d5d9bd47c42400049e81d0e1e94948112277
parentc14c3c82da9a46c65008060ad8e6dacef1a24ba9
Merge branch 'dp/maint-rebase-fix' into maint

* dp/maint-rebase-fix:
  git-rebase--interactive: auto amend only edited commit
  git-rebase-interactive: do not squash commits on abort