add rule to rebase without updating base branch
parent
6a391aac67
commit
663e7e86b0
7
Makefile
7
Makefile
|
@ -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 > $@
|
||||
|
|
Loading…
Reference in New Issue