Merge branch 'next'

2009-10-31 05:31:52 -04:00 · 2009-10-31 05:31:52 -04:00 · d48c5e60d2
commit d48c5e60d2
parent 6b59bc54d2 d13faed3ff
1 changed files with 7 additions and 0 deletions
--- a/tools/push
+++ b/tools/push
@ -0,0 +1,7 @@
+#!/bin/sh
+
+git checkout master
+git merge --no-ff next
+git checkout next
+git rebase master
+git push