Skip to content

fix(update.js): add --squash option to update-tools so the commits are squashed #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpumford wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(update.js): add --squash option to update-tools so the commits are squashed #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions other/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ function update() {
}

shelljs.exec('git fetch generator');
shelljs.exec('git merge --no-commit generator/master');
shelljs.exec('git merge --squash --no-commit generator/master');

console.log(`${chalk.yellow('WARNING:')} Make sure to review the changes with ${chalk.bold('git diff HEAD')} before ` +
`committing, so no accidental changes are made to your app.`);
}
Expand Down