X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=PU;h=2a22632a82aefe6c28e072dc452bba991bae979c;hb=f00c80b8715ac45ba4e8f96c7dad963b6203e7e8;hp=2124b05222c0878d0bcbedef802f364d45b282bb;hpb=cc68633578c1c7f23fe249731a90eff94f17fda2;p=git.git

diff --git a/PU b/PU
index 2124b052..2a22632a 100755
--- a/PU
+++ b/PU
@@ -66,7 +66,8 @@ case "$#" in
 			esac
 		done
 		USED=`expr "$USED" : ',\(.*\)'`
-		git merge -n "Merge $USED" pu $USE || exit
+		git pull -n . $USE || exit
+		# git merge -n "Merge $USED" pu $USE || exit
 		HH=$UNUSE
 	done
 	exit
@@ -75,7 +76,8 @@ esac
 
 for H
 do
-	(IFS=",$IFS"; git merge -n "Merge $H" pu $H) || exit
+#	(IFS=",$IFS"; git merge -n "Merge $H" pu $H) || exit
+	(IFS=",$IFS"; git pull -n . $H) || exit
 done
 
 (IFS=",$IFS"; git show-branch master $* pu `git rev-parse --short $ORIG_HEAD`)