Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git pull with rebase

This commit is contained in:
Enno Rehling 2020-08-10 13:11:19 +02:00
parent 55704cfce8
commit d8a824631c
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
s/preview
View File

@ -25,7 +25,7 @@ cd $SOURCE
rm -rf tolua rm -rf tolua
git fetch || abort "failed to update source. do you have local changes?" git fetch || abort "failed to update source. do you have local changes?"
[ -z $1 ] || git checkout $1 [ -z $1 ] || git checkout $1
git pull -q git pull --rebase -q
git submodule update git submodule update
s/cmake-init s/cmake-init
s/build > /dev/null || abort "build failed." s/build > /dev/null || abort "build failed."

5
s/pull
View File

@ -1,5 +0,0 @@
#!/bin/sh
if [ ! -z $1 ]; then
git checkout $1
fi
git pull && git submodule update

2
s/upgrade
View File

@ -7,7 +7,7 @@ while [ ! -d $ROOT/.git ]; do
done done
cd $ROOT cd $ROOT
git pull git pull --rebase
git submodule update git submodule update
s/build s/build
s/runtests s/runtests