|
@@ -16,7 +16,7 @@ if [ -d .git/annex ] ; then
|
|
|
fi
|
|
|
|
|
|
[ -e pre-sync ] && sh pre-sync
|
|
|
-git stash push -u -m "SYNC SAVE"
|
|
|
+git stash push -m "SYNC SAVE"
|
|
|
git pull --all
|
|
|
|
|
|
[ -e mid-sync ] && sh mid-sync
|
|
@@ -28,6 +28,6 @@ rm "${TEMP}"
|
|
|
|
|
|
git push --all origin
|
|
|
[ -e post-sync ] && sh post-sync
|
|
|
-if git stash list | grep "SYNC SAVE" >/dev/null ; then
|
|
|
- git stash pop -q
|
|
|
+if git stash list | head -n1 | grep "SYNC SAVE" >/dev/null ; then
|
|
|
+ git stash pop
|
|
|
fi
|