Update pu rebuilding procedure.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 15, 2006 at 01:55 UTC
8158d510c641e2354cf24a10bc3e994c7a1e3125
1 file changed
+4
-3
PU
+4
-3
@@ -51,21 +51,22 @@ case "$#" in
51
break ;;
52
esac
53
I=0
54
- UNUSE=
55
- USE=
54
+ UNUSE= USE= USED=
55
for H in $HH
56
do
57
I=$(($I+1))
58
case " $ans " in
59
*' '$I' '*)
60
USE="$USE$H "
61
+ USED="$USED,$H"
62
;;
63
*)
64
UNUSE="$UNUSE$H "
65
;;
66
esac
67
done
68
- git pull -n . $USE || exit
68
+ USED=`expr "$USED" : ',\(.*\)'`
69
+ git merge -n "Merge $USED" pu $USE || exit
70
HH=$UNUSE
71
done
72
exit