Add scripts to unabsorb git dirs

[git-scripts.git] / update-remotes

diff --git a/update-remotes b/update-remotes
index b164567bc369ac2ddc58d733bf22bb1a85b654dc..dca6f3fe383b184490b838137fe4d623ca60f7ce 100755 (executable)
--- a/update-remotes
+++ b/update-remotes
@@ -2,6 +2,7 @@
 
 current="`git config --get --path remote.current.url`"
 origin="`git config --get --path remote.origin.url`"
+branches="master ${1:+$@}"
 
 if [ -n "$origin" ]; then
    if [ -n "$current" ]; then
@@ -16,11 +17,15 @@ elif [ -z "$current" ]; then
    exit 1
 fi
 
-git pull --ff-only current master &&
+git fetch current &&
+{ git pull --ff-only current master || git reset --hard current/master ; } &&
+git set-date &&
 
 web="`git config --get --path remote.web.url`" &&
 if [ -n "$web" ]; then
-   git push web
+   git push --force web $branches
 fi &&
 
-cd "$current" && exec git pull origin
+cd "$current" &&
+git pull origin &&
+exec git set-date