From: Santi Béjar <santi@agolina.net>
Date: Thu, 07 Jan 2010 16:00:36 GMT
Subject: Re: Difference between pull --rebase and fetch+rebase
Message-ID: <adf1fd3d1001070800k6fa501fej39b84f849b7e5b50@mail.gmail.com>
In-Reply-To: <27059158.post@talk.nabble.com>

On Thu, Jan 7, 2010 at 1:23 PM, martinvz
<martin.von.zweigbergk@gmail.com> wrote:
>
> I have a branch configured to track a remote branch by rebasing. I excepted
> that "git pull" would therefore be equivalent to fetching from the remote
> repository followed by rebasing the remote branch, but it isn't. When doing
> "git rebase <remote>/<branch>", it applies only the commits after the merge
> base. When doing "git pull", it tries to apply two more commits (the two
> commits preceding the merge base). Why is this?
>
> I get the same result even if I do "git pull --rebase <remote> <branch>", it
> doesn't seem to have anything to do with incorrect configuration of the
> branch.

Yes, both should do the same (at least when upstream is not rebased).
Can you provide a test case or instructions to reproduce the behavior?

Thanks,
Santi