Merge branch '05-frontend-and-isomorphic-bundles' of github.com:jverh…

…oelen/node-express-typescript-boilerplate into 06-web-security-and-rate-limiting

package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-express-typescript-boilerplate",
   "version": "0.0.1",
-  "description": "A cookbook full of recipes for developing web apps with Node.js and Express.js in TypeScript",
+  "description": "Boilerplate for developing web apps with Node.js, Express.js, Webpack and TypeScript",
   "main": "service/server/index.ts",
   "engines": {
     "node": ">=8.15.0",

pull-setup-commits-upwards.sh

@@ -1,32 +1,34 @@
+#!/usr/bin/env bash
+
 git checkout 02-express-middlewares-and-request-handlers
-git pull --rebase origin 01-setup
+git pull --no-edit origin 01-setup
 git push
 
 git checkout 03-server-application-design
-git pull --rebase origin 02-express-middlewares-and-request-handlers
+git pull --no-edit origin 02-express-middlewares-and-request-handlers
 git push
 
 git checkout 04-unit-and-integration-tests
-git pull --rebase origin 03-server-application-design
+git pull --no-edit origin 03-server-application-design
 git push
 
 git checkout 05-frontend-and-isomorphic-bundles
-git pull --rebase origin 04-unit-and-integration-tests
+git pull --no-edit origin 04-unit-and-integration-tests
 git push
 
 git checkout 06-web-security-and-rate-limiting
-git pull --rebase origin 05-frontend-and-isomorphic-bundles
+git pull --no-edit origin 05-frontend-and-isomorphic-bundles
 git push
 
 git checkout 07-fflip-feature-toggles
-git pull --rebase origin 06-web-security-and-rate-limiting
+git pull --no-edit origin 06-web-security-and-rate-limiting
 git push
 
-git checkout 08–environment-configuration
-git pull --rebase origin 07-fflip-feature-toggles
+git checkout 08-environment-configuration
+git pull --no-edit origin 07-fflip-feature-toggles
 git push
 
 git checkout master
-git pull --rebase origin 08–environment-configuration
+git pull --no-edit origin 08-environment-configuration
 git push