From: Baris Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 21 Jun 2010 11:16:01 +0000 (+0200)
Subject: merge -ff
X-Git-Tag: foo~103
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9da22182d117c3fb1e262e7aa857b7bba38a88cd;p=infrastructure.git

merge -ff
---

diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh
index 1620c2a..76befd0 100755
--- a/scripts/git-mirror.sh
+++ b/scripts/git-mirror.sh
@@ -44,7 +44,7 @@ function mirror () {
 	    msg "pulling from ${REPO_NAME}"
             run "git fetch origin --tags" ${REPO_DIR}
 	    run "git fetch origin" ${REPO_DIR}
-            run "git merge origin/master" ${REPO_DIR}
+            run "git merge --ff origin/master" ${REPO_DIR}
             if [ $? -ne 0 ]
             then
                 error "Can not fetch from ${MASTER_REPO}"
@@ -58,7 +58,7 @@ function mirror () {
         msg "pushing ${REPO_NAME} to local master"
         run "git fetch local_master --tags" ${REPO_DIR}
         run "git fetch local_master" ${REPO_DIR}
-        run "git merge local_master/master" ${REPO_DIR}
+        run "git merge --ff local_master/master" ${REPO_DIR}
         if [ $? -ne 0 ]
         then
             error "Can not fetch from ${MIRROR_REPO}"