projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
c872d31
)
fate.sh: Allow non-fast-forwards when updating sources
author
Diego Biurrun
<diego@biurrun.de>
Fri, 25 Oct 2013 13:21:44 +0000
(15:21 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Tue, 29 Oct 2013 13:46:28 +0000
(14:46 +0100)
tests/fate.sh
patch
|
blob
|
history
diff --git
a/tests/fate.sh
b/tests/fate.sh
index
7505181
..
6e0c0c6
100755
(executable)
--- a/
tests/fate.sh
+++ b/
tests/fate.sh
@@
-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
)