On Mon, 21 Jan 2008, Johannes Schindelin wrote:
> Hi,
>
> last night an idea hit me: if I "git pull --rebase blabla master", it
> could be that "blabla" decided to rebase "master" already, and ATM this
> would lead to quite a few conflicts, since commits that were not mine were
> rewritten.
Indeed.
> However, if we already have refs/remotes/blabla/master, we could DWIM the
> --rebase call to
>
> git rebase --onto FETCH_HEAD refs/remotes/blabla/master
I was believing this was already the case. Mind you, I never verified
it.
I think the best is really to have the equivalent of:
git fetch blabla/master
git rebase --onto blabla/master blabla/master@{1} HEAD
Nicolas
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
