From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2008 02:53:25 +0000 (-0700)
Subject: Merge branch 'dp/maint-rebase-fix' into maint
X-Git-Tag: v1.6.0.3~77
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ea2408bfe18b4f9d1eaa9d8587c5ae6196552cac;p=git.git

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
---

ea2408bfe18b4f9d1eaa9d8587c5ae6196552cac