This commit is contained in:
di-sukharev
2023-05-20 20:48:20 +08:00
parent dd39ef2473
commit 820365dd06
2 changed files with 2 additions and 0 deletions

View File

@@ -27282,6 +27282,7 @@ async function improveCommitMessagesWithRebase({
await import_exec.default.exec("git", ["config", "user.name", process.env.GITHUB_ACTOR]);
await import_exec.default.exec("git", ["fetch", "--all"]);
await import_exec.default.exec("git", ["checkout", source]);
await import_exec.default.exec("git", ["merge", `origin/${base}`]);
await import_exec.default.exec("git", ["rebase", "-i", `origin/${base}`], {
env: {
GIT_SEQUENCE_EDITOR: `sed -i -e 's/^pick/reword/g' "$1"`,

View File

@@ -151,6 +151,7 @@ async function improveCommitMessagesWithRebase({
await exec.exec('git', ['fetch', '--all']);
await exec.exec('git', ['checkout', source]);
await exec.exec('git', ['merge', `origin/${base}`]);
await exec.exec('git', ['rebase', '-i', `origin/${base}`], {
env: {