From 59dacefc8412509e23479f6483da62f40a77b950 Mon Sep 17 00:00:00 2001 From: Justin Pumford Date: Fri, 23 Sep 2016 12:09:08 -0600 Subject: [PATCH] fix(update.js): add --squash option to update-tools so the commits are squashed --- other/update.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/other/update.js b/other/update.js index d823be5..c20ec06 100644 --- a/other/update.js +++ b/other/update.js @@ -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.`); }