From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Apr 2018 07:28:21 +0000 (+0900)
Subject: Merge branch 'ws/rebase-p'
X-Git-Tag: v2.18.0-rc0~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57e4b1c67a7d56677565c7943b16184e63db242c;p=thirdparty%2Fgit.git

Merge branch 'ws/rebase-p'

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
---

57e4b1c67a7d56677565c7943b16184e63db242c