From 0f8583e04d619986c362b81778d606caaa861b5a Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Mon, 9 Oct 2017 19:28:43 -0700 Subject: [PATCH] Changes to 'make pull' - Do not `make clean` or `git clean` - Do not `make update` - Sync submodules recursively - Do not pass --rebase to git pull --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 661575e..b6edb8f 100644 --- a/Makefile +++ b/Makefile @@ -17,12 +17,9 @@ clean: rm -rf build pull: - git pull --rebase --recurse-submodules - git submodule sync + git pull --recurse-submodules + git submodule sync --recursive git submodule update --recursive --init - git clean -X -f -d - make clean - make update update: cd cookbook && ./update.sh \