Update plugins

Author: mattn

misc/push-pull/pull

@@ -5,5 +5,5 @@ if [ "x$1" = "x-usage" ]; then
   exit
 fi
 
-cd $MEMODIR && git pull origin master
+cd $MEMODIR && git pull origin master --rebase
 

misc/push-pull/pull.cmd

@@ -4,4 +4,4 @@ echo pull memo from server
 goto :eof
 :run
 setlocal
-cd %MEMODIR% && git pull origin master
+cd %MEMODIR% && git pull origin master --rebase

misc/push-pull/push

@@ -5,4 +5,4 @@ if [ "x$1" = "x-usage" ]; then
   exit
 fi
 
-cd $MEMODIR && git add -A --ignore-errors && git commit -m update && git push origin master
+cd $MEMODIR && git add -A --ignore-errors && (git commit -m update || git push origin master)

misc/push-pull/push.cmd

@@ -4,4 +4,4 @@ echo push memo to server
 goto :eof
 :run
 setlocal
-cd %MEMODIR% && git add -A --ignore-errors && git commit -m update && git push origin master
+cd %MEMODIR% && git add -A --ignore-errors && (git commit -m update || git push origin master)