kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Use 'git pull' in Meta/PU 

That way I'd get nicely formatted merge messages.
todo
Junio C Hamano 2006-02-04 00:08:13 -08:00
parent cc68633578
commit 1e96405028
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PU
View File

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