rename rule update to up
parent
59357ea10a
commit
9a5a9d5a71
2
Makefile
2
Makefile
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue