use git pull --rebase instead of just git pull

diff --git a/update_org_files b/update_org_files
index a17171be69b6f4e0e6ce10728b600d88f385cb86..d93a40bc0af098b84b43d3ec914244da19a4660f 100755 (executable)
--- a/update_org_files
+++ b/update_org_files
@@ -9,9 +9,11 @@ if [ "x$UPDATE_ORG_REALLY_DO_IT" == "xyesdoit" ]; then
         git status --porcelain -z | grep -z '^ M' | grep -z $ORG_GREP | \
             sed -z 's/^ M[[:space:]]*//g' | \
             xargs -0 git commit -m"$COMMIT_MESSAGE"
+        git pull --rebase;
         git push;
+    else
+        git pull --rebase;
     fi;
-    git pull;
 else
     if [ "x$NO_SAVE_ORG_BUFFERS" == "x" ]; then
         emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1