projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d5ddc9
)
scripts: Use git pull --rebase
author
Arun Raghavan
<arun@accosted.net>
Tue, 22 Jul 2014 18:45:17 +0000
(
00:15
+0530)
committer
Arun Raghavan
<arun@accosted.net>
Tue, 22 Jul 2014 18:46:24 +0000
(
00:16
+0530)
No point introducing redundant merge commits.
scripts/git-update.sh
patch
|
blob
|
history
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
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
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
if test $? -ne 0
then
echo "$m: update" >> $ERROR_LOG