diff --git a/merge-release-run.js b/merge-release-run.js index 1a1980b..cc5116d 100644 --- a/merge-release-run.js +++ b/merge-release-run.js @@ -61,7 +61,7 @@ const run = async () => { console.log('new version:', newVersion) exec(`git commit -a --amend --no-edit`) exec(`git checkout master`) - exec(`git merge --squash tmp`) + exec(`git merge tmp`) exec(`git commit --amend -m "${newVersion} published"`) exec(`npm publish --access=public`) exec(`git push merge-release master`) diff --git a/package.json b/package.json index a1195de..a5e3609 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "merge-release", - "version": "4.0.3", + "version": "4.0.5", "description": "", "scripts": { "test": "standard"