X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FFuzzer%2Fpull_and_push_fuzz_corpus.sh;h=05c322c6e5bfeb3bc890ea16745b9e727b63bdad;hb=66baef3d14369f4238275e535d8ce4e5a209caf8;hp=bd564e3dfe50a2175ed2ae38c519a73c668cfd2d;hpb=3b3cbed1b03f6c16e5ee962100bac1301f944214;p=oota-llvm.git

diff --git a/lib/Fuzzer/pull_and_push_fuzz_corpus.sh b/lib/Fuzzer/pull_and_push_fuzz_corpus.sh
index bd564e3dfe5..05c322c6e5b 100755
--- a/lib/Fuzzer/pull_and_push_fuzz_corpus.sh
+++ b/lib/Fuzzer/pull_and_push_fuzz_corpus.sh
@@ -8,10 +8,10 @@
 cd $1
 git add *
 git commit -m "fuzz test corpus"
-git pull --no-edit
+git pull --rebase --no-edit
 for((attempt=0; attempt<5; attempt++)); do
   echo GIT PUSH $1 ATTEMPT $attempt
   if $(git push); then break; fi
-  git pull --no-edit
+  git pull --rebase --no-edit
 done