@matheusbsbs / matheus-bagliano / commits / 1e96405028
Fork 0

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
@@ -66,7 +66,8 @@ case "$#" in
66 esac
67 done
68 USED=`expr "$USED" : ',\(.*\)'`
69 - git merge -n "Merge $USED" pu $USE || exit
69 + git pull -n . $USE || exit
70 + # git merge -n "Merge $USED" pu $USE || exit
71 HH=$UNUSE
72 done
73 exit
@@ -75,7 +76,8 @@ esac
76
77 for H
78 do
78 - (IFS=",$IFS"; git merge -n "Merge $H" pu $H) || exit
79 +# (IFS=",$IFS"; git merge -n "Merge $H" pu $H) || exit
80 + (IFS=",$IFS"; git pull -n . $H) || exit
81 done
82
83 (IFS=",$IFS"; git show-branch master $* pu `git rev-parse --short $ORIG_HEAD`)