![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Nov 2010 21:16:40 +0000 (13:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Nov 2010 21:16:40 +0000 (13:16 -0800) | ||
| commit | 9b8c8309d10435618e85572028869e8388c96a91 | |
| tree | ebb40f671c76f8d1466f352121803b5dbf1afd6b | tree | snapshot |
| parent | d51ec77fafdb0a85ff8be52dc8f823a29738f3c7 | commit | diff |
| parent | 68d5d03bc49a073be3b0e14b22d30d70e7ae686d | commit | diff |
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
* kb/maint-rebase-autosquash:
rebase: teach --autosquash to match on sha1 in addition to message
rebase: better rearranging of fixup!/squash! lines with --autosquash