diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:15 -0800 |
| commit | cbcf0a6981687b31635d806f45e77188c54b7cfc (patch) | |
| tree | 9b64faf7b902baa10fb0451a660992cb16b1e9ad /builtin/apply.c | |
| parent | 786f174dab50ea5333fadd1650aa709927a3099f (diff) | |
| parent | 68d5d03bc49a073be3b0e14b22d30d70e7ae686d (diff) | |
| download | git-cbcf0a6981687b31635d806f45e77188c54b7cfc.tar.gz | |
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
Diffstat (limited to 'builtin/apply.c')
0 files changed, 0 insertions, 0 deletions