projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
scripts: Use git pull --rebase
[platform/upstream/gstreamer.git]
/
scripts
/
git-update.sh
diff --git
a/scripts/git-update.sh
b/scripts/git-update.sh
index
e9c7494
..
43124a5
100755
(executable)
--- a/
scripts/git-update.sh
+++ b/
scripts/git-update.sh
@@
-35,12
+35,12
@@
for m in $CORE $MODULES $EXTRA_MODULES; do
echo "+ updating $m"
cd $m
- git pull
+ git pull
--rebase
if test $? -ne 0
then
echo "$m: update (trying stash, pull, stash apply)" >> $ERROR_LOG
git stash
- git pull
+ git pull
--rebase
if test $? -ne 0
then
echo "$m: update" >> $ERROR_LOG