Re: GIT rebase changes

obert Shearman" <[EMAIL PROTECTED]>> A : "Mike McCormack" <[EMAIL PROTECTED]>> Copie à : "Wine Devel" > Objet : Re: GIT rebase changes> > Mike McCormack wrote:> > >> > Hi GIT users,> >> > The GIT guys have made rebase and

Re: GIT rebase changes

Mike McCormack wrote: Hi GIT users, The GIT guys have made rebase and pull incompatible, and to use rebase (which is likely what we want to do for Wine), you must use "fetch" then "rebase", not "pull" (which does a merge). And on a slightly related note, I wrote a script which works kinda

Re: GIT rebase changes

I hate to reply to myself, but ... Michael Stefaniuc wrote: Mike McCormack wrote: The GIT guys have made rebase and pull incompatible, and to use rebase (which is likely what we want to do for Wine), you must use "fetch" then "rebase", not "pull" (which does a merge). Depends if you want to

Re: GIT rebase changes

Hi! Mike McCormack wrote: The GIT guys have made rebase and pull incompatible, and to use rebase (which is likely what we want to do for Wine), you must use "fetch" then "rebase", not "pull" (which does a merge). Depends if you want to keep your old history or not. "git pull" works nicely.

GIT rebase changes

Hi GIT users, The GIT guys have made rebase and pull incompatible, and to use rebase (which is likely what we want to do for Wine), you must use "fetch" then "rebase", not "pull" (which does a merge). See: http://article.gmane.org/gmane.linux.kernel/365410 The error message that you get if