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 /t/t6029-merge-subtree.sh | |
| parent | Merge branch 'mm/phrase-remote-tracking' (diff) | |
| parent | rebase: teach --autosquash to match on sha1 in addition to message (diff) | |
| download | tgif-cbcf0a6981687b31635d806f45e77188c54b7cfc.tar.xz | |
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 't/t6029-merge-subtree.sh')
0 files changed, 0 insertions, 0 deletions