| commit | cbcf0a6981687b31635d806f45e77188c54b7cfc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 23:55:15 +0000 (24 15:55 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 23:55:15 +0000 (24 15:55 -0800) | ||
| tree | 9b64faf7b902baa10fb0451a660992cb16b1e9ad | treesnapshot (tar.gz zip) |
| parent | 786f174dab50ea5333fadd1650aa709927a3099f | commitdiff |
| parent | 68d5d03bc49a073be3b0e14b22d30d70e7ae686d | commitdiff |
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
* kb/maint-rebase-autosquash:
rebase: teach --autosquash to match on sha1 in addition to message
rebase: better rearranging of fixup!/squash! lines with --autosquash