Re: Difference between pull --rebase and fetch+rebase

Thanks for your post, Santi. I can not share my repository since it is a
project at work. I was troubleshooting a bit myself and found the following
section in git-pull.sh:

	oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
	for reflog in $(git rev-list -g $remoteref 2>/dev/null)
	do
		if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
		then
			oldremoteref="$reflog"
			break
		fi
	done

Why is it that reflog entries are allowed to override the remote reference?


Thanks,
Martin



Santi Béjar-2 wrote:

On Thu, Jan 7, 2010 at 1:23 PM, martinvz
[off-list ref] wrote:

quoted

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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
View this message in context: http://n2.nabble.com/Difference-between-pull-rebase-and-fetch-rebase-tp4266164p4268064.html
Sent from the git mailing list archive at Nabble.com.