Merge pull request #10529 from tkelman/tk/pkg-update-rebase

pull with --rebase in Pkg.update()
JuliaLang · Mar 17, 2015 · b201312 · b201312
2 parents ad50bad + 7a037fe
commit b201312
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/base/pkg/entry.jl b/base/pkg/entry.jl
@@ -247,7 +247,7 @@ function update(branch::AbstractString)
         end
         # TODO: handle merge conflicts
         Base.with_env("GIT_MERGE_AUTOEDIT","no") do
-            Git.run(`pull -q`, out=DevNull)
+            Git.run(`pull --rebase -q`, out=DevNull)
         end
     end
     avail = Read.available()