| commit | fde566f222bd473193d9b39b44973a013f8b48b2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Nov 2018 11:39:01 +0000 (21 20:39 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Nov 2018 11:39:01 +0000 (21 20:39 +0900) | ||
| tree | fe39398205f5d6ceaee1f3e8d1c551b0a0044ecd | treesnapshot (tar.gz zip) |
| parent | c17f086ecad796b4179aa1b0209f00d4f8ffdc0f | commitdiff |
| parent | 7e097e27d3a9a5a8517d8ed139dcfdb1a21fd87a | commitdiff |
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
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