Re: Git-using core devs: preference for merge vs. rebase?

Hi Tom, On Nov 2, 12:58 pm, "Tom X. Tobin" wrote: > Do the Git-using core developers have a preference for merge vs. > rebase for updating an upstream-tracking branch?  I prefer to rebase > to keep the changes in question at the branch HEAD, especially if the > branch

Re: Git-using core devs: preference for merge vs. rebase?

On Wed, Nov 3, 2010 at 12:58 AM, Tom X. Tobin wrote: > Do the Git-using core developers have a preference for merge vs. > rebase for updating an upstream-tracking branch?  I prefer to rebase > to keep the changes in question at the branch HEAD, especially if the > branch

Re: Git-using core devs: preference for merge vs. rebase?

On Nov 3, 5:58 am, "Tom X. Tobin" wrote: > Do the Git-using core developers have a preference for merge vs. > rebase for updating an upstream-tracking branch?  I prefer to rebase > to keep the changes in question at the branch HEAD, especially if the > branch hasn't been

Git-using core devs: preference for merge vs. rebase?

Do the Git-using core developers have a preference for merge vs. rebase for updating an upstream-tracking branch? I prefer to rebase to keep the changes in question at the branch HEAD, especially if the branch hasn't been pushed publicly yet, but a rebase for something that *has* been pushed