diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-16 14:42:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-16 14:42:52 -0800 |
| commit | f3adf457e046f92f039353762a78dcb3afb2cb13 (patch) | |
| tree | d88cafeeb77655862fd61def3256ce5eca2cb3b8 /contrib/subtree/t/t7900-subtree.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | rebase -i: remember merge options beyond continue actions (diff) | |
| download | tgif-f3adf457e046f92f039353762a78dcb3afb2cb13.tar.xz | |
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
Diffstat (limited to 'contrib/subtree/t/t7900-subtree.sh')
0 files changed, 0 insertions, 0 deletions