prompt for the MERG_HEAD sides commits

[next-scripts] / to_ozlabs

diff --git a/to_ozlabs b/to_ozlabs
index 5237cf2f65351a2b22e906469c7b4963c15ee6ac..e1d30c801d0b9e985476de761b7d3228a74564c7 100755 (executable)
--- a/to_ozlabs
+++ b/to_ozlabs
@@ -9,7 +9,7 @@ ssh ozlabs.org "cd kernels/linus.git; git remote update"
 
 for i in $GIT_REPOS; do
        echo "Pushing $i"
-       ( cd $i; git push bilbo )
+       ( cd $i; git push --prune bilbo )
        [ "${i%.git}" = "$i" ] &&
                ssh ozlabs.org "cd kernels/next/$i; git reset --hard"
 done
@@ -19,20 +19,21 @@ done
 - gitk.cache
 - /merge.debug
 - /merge.log
-- /quilt-import.log
 - /akpm-import.log
 - /summ
 - /patch-*-next-2*
 - /next-2*/
 + .git/
 + .git/config
++ .git/hooks
++ .git/hooks/**
 + /next/.git/rr-cache/
 + /next/.git/rr-cache/**
 EOF
        for i in $GIT_REPOS; do
                echo "- $i/**"
        done
-} | rsync -avHP --include-from - --delete . ozlabs.org:kernels/next/.
+} | rsync -avHP --open-noatime --include-from - --delete . ozlabs.org:kernels/next/.
 
 ssh ozlabs.org "touch kernels/NEXT-DONE"