From: Junio C Hamano Date: Tue, 16 Sep 2008 07:50:57 +0000 (-0700) Subject: Merge branch 'dp/maint-rebase-fix' X-Git-Tag: v1.6.1-rc1~236 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=132c6e443cb76d0baf9eece7b9424d25dc83a91d;p=git.git 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 --- 132c6e443cb76d0baf9eece7b9424d25dc83a91d