From 1c4326111fe8badbaebdd5d744d942d517fc4df8 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Tue, 31 Mar 2015 22:34:04 +1000 Subject: [PATCH] Split out subtree merges into their own Makefile entries --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e6b9efd5c..f9334689e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ GIT=git +GIT_SUBTREE=$(GIT) subtree pull --squash SYNC=rsync -rtvx --cvs-exclude --exclude '.*.swp' default: @@ -29,6 +30,10 @@ push-personal pp: push-testing: $(GIT) push testing -update-subtrees: - $(GIT) subtree pull --squash --prefix=html/js/datetime https://github.com/Eonasdan/bootstrap-datetimepicker master - $(GIT) subtree pull --squash --prefix=html/js/moment https://github.com/moment/moment master +update-subtrees: datetime-subtree moment-subtree + +datetime-subtree: + $(GIT_SUBTREE) --prefix=html/js/datetime https://github.com/Eonasdan/bootstrap-datetimepicker master + +moment-subtree: + $(GIT_SUBTREE) --prefix=html/js/moment https://github.com/moment/moment master