diff --git a/lib/git.js b/lib/git.js index 72448cf4..0760c46a 100644 --- a/lib/git.js +++ b/lib/git.js @@ -34,7 +34,7 @@ function init() { yield util_1.execute(`git init`, constants_1.workspace); yield util_1.execute(`git config user.name ${constants_1.action.name}`, constants_1.workspace); yield util_1.execute(`git config user.email ${constants_1.action.email}`, constants_1.workspace); - yield util_1.execute(`git pull ${constants_1.repositoryPath}`, constants_1.workspace); + yield util_1.execute(`git pull --rebase ${constants_1.repositoryPath}`, constants_1.workspace); } catch (error) { core.setFailed(`There was an error initializing the repository: ${error}`); diff --git a/src/git.ts b/src/git.ts index d950e629..fbeeb36f 100644 --- a/src/git.ts +++ b/src/git.ts @@ -22,7 +22,7 @@ export async function init(): Promise { await execute(`git init`, workspace); await execute(`git config user.name ${action.name}`, workspace); await execute(`git config user.email ${action.email}`, workspace); - await execute(`git pull ${repositoryPath}`, workspace); + await execute(`git pull --rebase ${repositoryPath}`, workspace); } catch (error) { core.setFailed(`There was an error initializing the repository: ${error}`); } finally {