Merge branch 'ws/rebase-p' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Mar 2018 01:27:22 +0000 (18:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Mar 2018 01:27:22 +0000 (18:27 -0700)
Code clean-up.

* ws/rebase-p:
rebase: remove merges_option and a blank line
rebase: remove unused code paths from git_rebase__interactive__preserve_merges
rebase: remove unused code paths from git_rebase__interactive
rebase: add and use git_rebase__interactive__preserve_merges
rebase: extract functions out of git_rebase__interactive
rebase: reindent function git_rebase__interactive
rebase: update invocation of rebase dot-sourced scripts
rebase-interactive: simplify pick_on_preserving_merges

Trivial merge