mirror of
https://github.com/di-sukharev/opencommit.git
synced 2026-04-20 03:02:51 -04:00
build
This commit is contained in:
@@ -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: {
|
||||
|
||||
@@ -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}`], {
|
||||
|
||||
Reference in New Issue
Block a user