This commit is contained in:
di-sukharev
2023-05-20 20:51:23 +08:00
parent bf430b23db
commit 13afc81858
2 changed files with 4 additions and 4 deletions

View File

@@ -27284,8 +27284,8 @@ async function improveCommitMessagesWithRebase({
await import_exec.default.exec("git", ["checkout", source]);
await import_exec.default.exec("git", [
"merge",
`origin/${base}`,
"--allow-unrelated-histories"
"--allow-unrelated-histories",
`origin/${base}`
]);
await import_exec.default.exec("git", ["rebase", "-i", `origin/${base}`], {
env: {

View File

@@ -153,8 +153,8 @@ async function improveCommitMessagesWithRebase({
await exec.exec('git', ['checkout', source]);
await exec.exec('git', [
'merge',
`origin/${base}`,
'--allow-unrelated-histories'
'--allow-unrelated-histories',
`origin/${base}`
]);
await exec.exec('git', ['rebase', '-i', `origin/${base}`], {