[Xfce4-commits] <xfce-git-hooks:master> Try pulling with rebase.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 2d6a0591ea77188b5a1f3d9f61d56d9443bec614 (commit)
       from fbc9ed58dc44203adceb2f2302ff3509471befc0 (commit)

commit 2d6a0591ea77188b5a1f3d9f61d56d9443bec614
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Mon May 24 00:03:38 2010 +0200

    Try pulling with rebase.

 hooks/post-update-03-www-pull |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hooks/post-update-03-www-pull b/hooks/post-update-03-www-pull
index 8dd253b..a77d66f 100755
--- a/hooks/post-update-03-www-pull
+++ b/hooks/post-update-03-www-pull
@@ -2,10 +2,10 @@
 
 case "$REPO" in
   www/wiki.xfce.org)
-    GIT_DIR=/var/www/wiki.xfce.org/.git git pull
+    GIT_DIR=/var/www/wiki.xfce.org/.git git pull --rebase
     ;;
 
   www/www.xfce.org)
-    GIT_DIR=/var/www/www.xfce.org/.git git pull
+    GIT_DIR=/var/www/www.xfce.org/.git git pull --rebase
     ;;
 esac