projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conditionally allow specifying -j; default to -j2
[git.git]
/
PU
diff --git
a/PU
b/PU
index
c96ccbc
..
4b4be2b
100755
(executable)
--- a/
PU
+++ b/
PU
@@
-9,8
+9,15
@@
case "$(git-diff-index --name-status HEAD)" in
*) echo 2>&1 "Local modifications exist."
exit 1;;
esac
*) echo 2>&1 "Local modifications exist."
exit 1;;
esac
-git checkout pu &&
-git reset --hard master &&
+
+case "$1" in
+--continue)
+ shift
+ ;;
+*)
+ git checkout pu &&
+ git reset --hard master || exit
+esac
ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit
LF='
'
ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit
LF='
'
@@
-66,7
+73,8
@@
case "$#" in
esac
done
USED=`expr "$USED" : ',\(.*\)'`
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
HH=$UNUSE
done
exit
@@
-75,7
+83,8
@@
esac
for H
do
for H
do
+# (IFS=",$IFS"; git merge -n "Merge $H" pu $H) || exit
(IFS=",$IFS"; git pull -n . $H) || exit
done
(IFS=",$IFS"; git pull -n . $H) || exit
done
-(IFS=",$IFS"; git show-branch master
pu $* $ORIG_HEAD
)
+(IFS=",$IFS"; git show-branch master
$* pu `git rev-parse --short $ORIG_HEAD`
)