Explorar o código

Don't do a "git pull --rebase" before "git reset --hard"

Rebasing the old branch content doesn't make sense if we are
going to throw it away with a "git reset --hard" directly
afterwards. When rebasing the old branch content the process
could easily fail if the old patches didn't apply any longer.

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Martin Storsjö %!s(int64=11) %!d(string=hai) anos
pai
achega
aab218791a
Modificáronse 1 ficheiros con 0 adicións e 1 borrados
  1. 0 1
      buildMobileVLCKit.sh

+ 0 - 1
buildMobileVLCKit.sh

@@ -136,7 +136,6 @@ fi
 cd ..
 else
 cd vlc
-git pull --rebase
 git reset --hard ${TESTEDHASH}
 git am ../../patches/*.patch
 cd ..