|
|
@@ -18,8 +18,14 @@ fi
|
|
|
[ -e pre-sync ] && sh pre-sync
|
|
|
git stash push -u -m "SYNC SAVE"
|
|
|
git pull --all
|
|
|
+
|
|
|
[ -e mid-sync ] && sh mid-sync
|
|
|
-git branch --merged | grep -vFf <(git branch -r | cut -d'/' -f2-) | xargs git branch -d
|
|
|
+
|
|
|
+TEMP=$(mktemp)
|
|
|
+git branch -r | cut -d'/' -f2- > "${TEMP}"
|
|
|
+git branch --merged | grep -vFf "${TEMP}" | xargs git branch -d
|
|
|
+rm "${TEMP}"
|
|
|
+
|
|
|
git push --all origin
|
|
|
[ -e post-sync ] && sh post-sync
|
|
|
if git stash list | grep "SYNC SAVE" >/dev/null ; then
|
