mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

scripts: Use git pull --rebase

Browse source 
No point introducing redundant merge commits.
This commit is contained in:
Arun Raghavan 2014-07-23 00:15:17 +05:30
parent 0d5ddc96f2
commit f6e4ca0d2d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/git-update.sh
View file

@ -35,12 +35,12 @@ for m in $CORE $MODULES $EXTRA_MODULES; do
echo "+ updating $m" echo "+ updating $m"
cd $m cd $m
git pull git pull --rebase
if test $? -ne 0 if test $? -ne 0
then then
echo "$m: update (trying stash, pull, stash apply)" >> $ERROR_LOG echo "$m: update (trying stash, pull, stash apply)" >> $ERROR_LOG
git stash git stash
git pull git pull --rebase
if test $? -ne 0 if test $? -ne 0
then then
echo "$m: update" >> $ERROR_LOG echo "$m: update" >> $ERROR_LOG