Merge branch 'dl/rebase-with-autobase'
"git rebase" did not work well when format.useAutoBase configuration variable is set, which has been corrected. * dl/rebase-with-autobase: rebase: fix format.useAutoBase breakage format-patch: teach --no-base t4014: use test_config() format-patch: fix indentation t3400: demonstrate failure with format.useAutoBase
This commit is contained in:
@ -1039,7 +1039,8 @@ static int run_am(struct rebase_options *opts)
|
||||
argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
|
||||
"--full-index", "--cherry-pick", "--right-only",
|
||||
"--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
|
||||
"--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL);
|
||||
"--no-cover-letter", "--pretty=mboxrd", "--topo-order",
|
||||
"--no-base", NULL);
|
||||
if (opts->git_format_patch_opt.len)
|
||||
argv_array_split(&format_patch.args,
|
||||
opts->git_format_patch_opt.buf);
|
||||
|
||||
Reference in New Issue
Block a user