From: Junio C Hamano Date: Sun, 18 Nov 2018 09:23:59 +0000 (+0900) Subject: Merge branch 'js/rebase-am-options' X-Git-Tag: v2.20.0-rc0~3 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=137c1f2f51bceb8d1f1f457c52129be78c0ac86d 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 and --whitespace= parameters early rebase: really just passthru the `git am` options --- 137c1f2f51bceb8d1f1f457c52129be78c0ac86d