tree fe39398205f5d6ceaee1f3e8d1c551b0a0044ecd
parent c17f086ecad796b4179aa1b0209f00d4f8ffdc0f
parent 7e097e27d3a9a5a8517d8ed139dcfdb1a21fd87a
author Junio C Hamano <gitster@pobox.com> 1542800341 +0900
committer Junio C Hamano <gitster@pobox.com> 1542800341 +0900

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