$ git pull --rebase just pulls and then rebases your local commits. It gives up (with an error message) if there are unstaged changes in the workspace.
On 9/19/13, Carter Schonwald <carter.schonw...@gmail.com> wrote: > what does the rebase flag do? I did my rebase via the sourcetree gui app.. > > > On Wed, Sep 18, 2013 at 6:40 PM, Gabor Greif <ggr...@gmail.com> wrote: > >> I had the same error, turned out that >> ./sync-all pull --rebase >> did not correctly terminate, because I had modified files around >> This helped: >> ./sync-all pull >> perl boot >> ./configure >> make --keep-going >> >> HTH, >> >> Gabor >> >> On 9/19/13, Carter Schonwald <carter.schonw...@gmail.com> wrote: >> > hey all, >> > i just rebased my prefetch patch onto HEAD, and now i'm working on >> getting >> > ghc to build >> > >> > looks like Data.Primitive.Types is trying to import PrimWrappers rather >> > than PrimOpWrappers? >> > >> > i patched that up in my local build, but that seems to be missing, >> > unless >> > i'm overlooking somthing and i'm botching the submodules? >> > >> > _______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs