summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-10-31 05:34:51 -0400
committerJohn Wiegley <johnw@newartisans.com>2009-10-31 05:34:51 -0400
commita2e643fc3df1ffd25e741cb2aad8981d868ae8aa (patch)
tree1ddd5ff79eb04e480d21f9dd5a479d61df09f9b0
parentd48c5e60d2213d619fa23c78f6bdcc5473fd6834 (diff)
parent03d05800893ee5d8df859fb9f7d3c826e5483fa0 (diff)
downloadfork-ledger-a2e643fc3df1ffd25e741cb2aad8981d868ae8aa.tar.gz
fork-ledger-a2e643fc3df1ffd25e741cb2aad8981d868ae8aa.tar.bz2
fork-ledger-a2e643fc3df1ffd25e741cb2aad8981d868ae8aa.zip
Merge branch 'next'
-rwxr-xr-xtools/push4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/push b/tools/push
index 7b149e8f..2d8be6a2 100755
--- a/tools/push
+++ b/tools/push
@@ -1,5 +1,9 @@
#!/bin/sh
+set -e
+
+(cd plan/data; git push)
+(cd plan; git commit -a -m "Update TODO files" && git push)
git checkout master
git merge --no-ff next
git checkout next