1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-02 17:12:49 +02:00

Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-29 21:45:18 +01:00
commit a8fe8d4fe9

View File

@ -35,7 +35,7 @@ checkout(){
update()(
cd ${src} || return
case "$repo" in
git:*) git pull --quiet ;;
git:*) git fetch --force; git reset --hard origin/master ;;
esac
)