From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Feb 2006 08:08:13 +0000 (-0800)
Subject: Use 'git pull' in Meta/PU
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1e9640502881d95cec3ff6e06f6dc68d33cbc86e;p=git.git

Use 'git pull' in Meta/PU

That way I'd get nicely formatted merge messages.
---

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`)