rename rule update to up

master
melvinzhang 2014-11-01 10:03:35 +08:00
parent 59357ea10a
commit 9a5a9d5a71
1 changed files with 1 additions and 1 deletions

View File

@ -681,7 +681,7 @@ 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
update:
up:
git fetch -v origin master
git merge --ff-only origin/master
git fetch -v firemind master