From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Nov 2010 21:16:40 +0000 (-0800)
Subject: Merge branch 'kb/maint-rebase-autosquash' into next
X-Git-Tag: ko-next~148
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b8c8309d10435618e85572028869e8388c96a91;p=git.git

Merge branch 'kb/maint-rebase-autosquash' into next

* kb/maint-rebase-autosquash:
  rebase: teach --autosquash to match on sha1 in addition to message
  rebase: better rearranging of fixup!/squash! lines with --autosquash
---

9b8c8309d10435618e85572028869e8388c96a91