projects
/
jprojects-scripts.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ef4fb0
)
No more abort + merging upstream added (work).
author
Roland Haeder
<roland@mxchange.org>
Fri, 13 May 2016 19:21:48 +0000
(21:21 +0200)
committer
Roland Haeder
<roland@mxchange.org>
Fri, 13 May 2016 19:21:48 +0000
(21:21 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
pull-stick.sh
patch
|
blob
|
history
diff --git
a/pull-stick.sh
b/pull-stick.sh
index c65578386902d47d67b24d42739b67b2674c6789..4eeb02ea9180aa8aa1bc7bb72b6b14c170630c5d 100755
(executable)
--- a/
pull-stick.sh
+++ b/
pull-stick.sh
@@
-29,13
+29,16
@@
for project in ${LIST}; do
if [ "$?" != "0" ]
then
if [ "$?" != "0" ]
then
- git pull --all
|| exit 255
+ git pull --all
fi
fi
+ echo "$0: Merging upstream into '${project}' ..."
+ git merge -S upstream/master
+
if [ "$1" != "s" ]
then
echo "$0: Rebasing '${project}' ..."
if [ "$1" != "s" ]
then
echo "$0: Rebasing '${project}' ..."
- git rebase origin/master || exit 255
+ git rebase
-Sm
origin/master || exit 255
fi
done
fi
done