Andrew's git / gitweb.git / diff
?
Merge branch 'kb/maint-rebase-autosquash'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 23:55:15 +0000 (15:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 23:55:15 +0000 (15:55 -0800)
* kb/maint-rebase-autosquash:
rebase: teach --autosquash to match on sha1 in addition to message
rebase: better rearranging of fixup!/squash! lines with --autosquash

Trivial merge