Merge branch 'js/rebase-am-options'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:59 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:59 +0000 (18:23 +0900)
commit137c1f2f51bceb8d1f1f457c52129be78c0ac86d
treef7b2495f49cf286356b0afce753840bf3e6e46b3
parent7bdebaa646787b98679799ee27bfb42fb7daa8ca
parent04519d72011478e17b2dbb177820ef2c886b8e5f
Merge branch 'js/rebase-am-options'

The way "git rebase" parses and forwards the command line options
meant for underlying "git am" has been revamped, which fixed for
options with parameters that were not passed correctly.

* js/rebase-am-options:
  rebase: validate -C<n> and --whitespace=<mode> parameters early
  rebase: really just passthru the `git am` options
builtin/rebase.c