Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename rule changes to fetch, ensure merge is ff-only for rebase-firemind

master
melvinzhang 2014-10-29 09:43:09 +08:00
parent 5a10ab2b8f
commit b1c3a84b4f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -689,7 +689,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
changes:
fetch:
git fetch -v origin master
git fetch -v firemind master
@ -697,10 +697,11 @@ rebase-firemind:
git rebase base firemind/master --onto master
git branch temp
git checkout master
git merge temp
git merge --ff-only temp
git branch -d temp
git branch -d base
git branch base firemind/master
git checkout base
git merge --ff-only firemind/master
git checkout master
properties.diff:
diff <(cat `grep name= cards/scriptable.txt | sed -f scripts/normalize_name.sed | sed 's/name_/release\/Magarena\/scripts\//;s/$$/.txt/'`) \