projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8124686
)
Update pu rebuilding procedure.
author
Junio C Hamano
<junkio@cox.net>
Sun, 15 Jan 2006 09:55:09 +0000
(
01:55
-0800)
committer
Junio C Hamano
<junkio@cox.net>
Sun, 15 Jan 2006 09:55:09 +0000
(
01:55
-0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
PU
patch
|
blob
|
history
diff --git
a/PU
b/PU
index
7af28ac
..
c96ccbc
100755
(executable)
--- a/
PU
+++ b/
PU
@@
-51,21
+51,22
@@
case "$#" in
break ;;
esac
I=0
- UNUSE=
- USE=
+ UNUSE= USE= USED=
for H in $HH
do
I=$(($I+1))
case " $ans " in
*' '$I' '*)
USE="$USE$H "
+ USED="$USED,$H"
;;
*)
UNUSE="$UNUSE$H "
;;
esac
done
- git pull -n . $USE || exit
+ USED=`expr "$USED" : ',\(.*\)'`
+ git merge -n "Merge $USED" pu $USE || exit
HH=$UNUSE
done
exit