Merge branch 'dp/maint-rebase-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:50:57 +0000 (00:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:50:57 +0000 (00:50 -0700)
* dp/maint-rebase-fix:
  git-rebase--interactive: auto amend only edited commit
  git-rebase-interactive: do not squash commits on abort


Trivial merge