From 5786148acd1cdc054185cb473be612a58bb74d59 Mon Sep 17 00:00:00 2001 From: melvinzhang Date: Wed, 29 Oct 2014 16:38:56 +0800 Subject: [PATCH] rename rule fetch to update, also fast forward master to origin/master --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4a465a7a75..604eb8172c 100644 --- a/Makefile +++ b/Makefile @@ -689,8 +689,9 @@ img-mtgimage: grep mtgimage -L `grep token= -L release/Magarena/scripts/*.txt` | parallel awk -f scripts/set_image.awk {} '>' {.}.img -ls -1 release/Magarena/scripts/*.img | parallel mv {} {.}.txt -fetch: +update: git fetch -v origin master + git merge --ff-only origin/master git fetch -v firemind master rebase-firemind: