| commit | f3adf457e046f92f039353762a78dcb3afb2cb13 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Dec 2015 22:42:52 +0000 (16 14:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Dec 2015 22:42:52 +0000 (16 14:42 -0800) | ||
| tree | d88cafeeb77655862fd61def3256ce5eca2cb3b8 | treesnapshot (tar.gz zip) |
| parent | 787407e5e05ef5cc8bcf15ccae01cd34bfd90573 | commitdiff |
| parent | 040fd39e672fce2b549b842895ceb4f5063026f3 | commitdiff |
Merge branch 'fr/rebase-i-continue-preserve-options'
"git rebase -i" started with merge strategy options did not
propagate them upon "git rebase --continue".
* fr/rebase-i-continue-preserve-options:
rebase -i: remember merge options beyond continue actions
"git rebase -i" started with merge strategy options did not
propagate them upon "git rebase --continue".
* fr/rebase-i-continue-preserve-options:
rebase -i: remember merge options beyond continue actions