summaryrefslogtreecommitdiff
path: root/tools/push
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-11-10 12:22:19 -0500
committerJohn Wiegley <johnw@newartisans.com>2009-11-10 12:22:19 -0500
commit5ffa987daf4d97c52066e4c28733d826d3726297 (patch)
treeab058dec32702ccce9d1f7cacacb5b5c157d6798 /tools/push
parent9e07e61fadf7f3c9d1fd32a3805f6e97163eba15 (diff)
parent3f638d355c977fd5513ab1db380c5813599f3664 (diff)
downloadfork-ledger-5ffa987daf4d97c52066e4c28733d826d3726297.tar.gz
fork-ledger-5ffa987daf4d97c52066e4c28733d826d3726297.tar.bz2
fork-ledger-5ffa987daf4d97c52066e4c28733d826d3726297.zip
Merge branch 'next'
Diffstat (limited to 'tools/push')
-rwxr-xr-xtools/push3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/push b/tools/push
index 2d8be6a2..206ec87c 100755
--- a/tools/push
+++ b/tools/push
@@ -9,3 +9,6 @@ git merge --no-ff next
git checkout next
git rebase master
git push
+git checkout master
+./acprep upload
+git checkout next