From: Junio C Hamano <redacted>
Date: Wed, 16 Dec 2015 22:42:52 +0000 (-0800)
Subject: Merge branch 'fr/rebase-i-continue-preserve-options'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f3adf457e046f92f039353762a78dcb3afb2cb13;p=git.git

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

f3adf457e046f92f039353762a78dcb3afb2cb13