X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=update_org_files;h=d93a40bc0af098b84b43d3ec914244da19a4660f;hb=32dd5b77200d893951c21395995ffa942eca1d5f;hp=668f7e95078ab71d8d366f51de2c04fdf66933b2;hpb=a43af7baa731232d111de4ceeebd8ebb6f4d6317;p=bin.git

diff --git a/update_org_files b/update_org_files
index 668f7e9..d93a40b 100755
--- a/update_org_files
+++ b/update_org_files
@@ -9,11 +9,15 @@ 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
-    emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
+    if [ "x$NO_SAVE_ORG_BUFFERS" == "x" ]; then
+        emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
+    fi;
     UPDATE_ORG_REALLY_DO_IT="yesdoit" mr -d ~/projects/org-notes -j5 run \
                            update_org_files "$COMMIT_MESSAGE"
     UPDATE_ORG_REALLY_DO_IT="yesdoit" mr -d ~/org-mode -j5 run \