Merge branch 'next'
This commit is contained in:
commit
a2e643fc3d
1 changed files with 4 additions and 0 deletions
|
|
@ -1,5 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
(cd plan/data; git push)
|
||||||
|
(cd plan; git commit -a -m "Update TODO files" && git push)
|
||||||
git checkout master
|
git checkout master
|
||||||
git merge --no-ff next
|
git merge --no-ff next
|
||||||
git checkout next
|
git checkout next
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue