diff options
author | Rudolf Polzer <divVerent@xonotic.org> | 2013-11-04 16:46:21 +0100 |
---|---|---|
committer | Rudolf Polzer <divVerent@xonotic.org> | 2013-11-04 16:46:21 +0100 |
commit | 727597474c6bac2d7c692ed86d5367f6e435a4c5 (patch) | |
tree | 196e9c1ce9300d78f30824cd27f10f1a8583bcc0 | |
parent | 2af43892a6c77cbacd88b95e091da4f293e3d13b (diff) | |
download | mpv-build-727597474c6bac2d7c692ed86d5367f6e435a4c5.tar.bz2 mpv-build-727597474c6bac2d7c692ed86d5367f6e435a4c5.tar.xz |
update --master: use git pull --rebase.
-rwxr-xr-x | update | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -13,7 +13,7 @@ do_gitmaster() { set -ex git submodule foreach 'git checkout master' - git submodule foreach 'git pull' + git submodule foreach 'git pull --rebase' git submodule foreach 'git remote prune origin' } @@ -40,7 +40,7 @@ do_releasetag() if [ x"$1" != x"--skip-selfupdate" ]; then ( set -ex - git pull + git pull --rebase ) exec "$0" --skip-selfupdate "$@" fi |