Merge branch 'dp/maint-rebase-fix'
commit132c6e443cb76d0baf9eece7b9424d25dc83a91d
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:50:57 +0000 (16 00:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:50:57 +0000 (16 00:50 -0700)
tree7eb4c96690840054ef2ae02d0065df114bc12808
parent578421fbd8db6602f290862f44843fc896b4fb0b
parentc14c3c82da9a46c65008060ad8e6dacef1a24ba9
Merge branch 'dp/maint-rebase-fix'

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