From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 11:39:01 +0000 (+0900)
Subject: Merge branch 'js/rebase-am-options-fix'
X-Git-Tag: v2.20.0-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fde566f222bd473193d9b39b44973a013f8b48b2;p=thirdparty%2Fgit.git

Merge branch 'js/rebase-am-options-fix'

Recently, built-in "rebase" tightened the error checking for a few
options that are passed to underlying "am", but we forgot to make
the matching change to the scripted version, which has been
corrected.

* js/rebase-am-options-fix:
  legacy-rebase: backport -C<n> and --whitespace=<option> checks
---

fde566f222bd473193d9b39b44973a013f8b48b2