Browse files

update-org: Don't commit during a merge

  • Loading branch information...
1 parent 677472e commit 841440051e97014c6f00153e467bef8fc7f048f0 @nelhage committed Feb 22, 2010
Showing with 4 additions and 0 deletions.
  1. +4 −0 update-org
View
4 update-org
@@ -1,5 +1,9 @@
#!/bin/sh
+set -e
cd ~/nelhage/org/
+if [ -f ".git/MERGE_HEAD" ]; then
+ exit 0
+fi
git add -A
git commit -m 'Update.'
git push

0 comments on commit 8414400

Please sign in to comment.