That way I'd get nicely formatted merge messages.
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
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`)