From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 23:55:15 +0000 (-0800)
Subject: Merge branch 'kb/maint-rebase-autosquash'
X-Git-Tag: v1.7.4-rc0~121
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cbcf0a6981687b31635d806f45e77188c54b7cfc;p=git.git

Merge branch 'kb/maint-rebase-autosquash'

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

cbcf0a6981687b31635d806f45e77188c54b7cfc