add rule to rebase without updating base branch

master
melvinzhang 2014-11-15 08:49:08 +08:00
parent 6a391aac67
commit 663e7e86b0
1 changed files with 7 additions and 0 deletions

View File

@ -700,6 +700,13 @@ firemind:
git diff origin/master master | sed 's/b\///' >> firemind.diff
make normalize_files checks debug
%.rebase:
git checkout -b temp --no-track $*
git rebase -i master
git checkout master
git merge --ff-only temp
git branch -d temp
properties.diff:
diff <(cat `grep name= cards/scriptable.txt | sed -f scripts/normalize_name.sed | sed 's/name_/release\/Magarena\/scripts\//;s/$$/.txt/'`) \
<(sed '/^$$/d' cards/scriptable.txt) -d -u > $@