Use 'git pull' in Meta/PU
That way I'd get nicely formatted merge messages.
Junio C Hamano committed
Feb 4, 2006 at 00:08 UTC
1e9640502881d95cec3ff6e06f6dc68d33cbc86e
1 file changed
+4
-2
PU
+4
-2
index 2124b05222..2a22632a82 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`)