From: Santi Béjar Date: Sun, 19 Jul 2009 07:45:16 +0000 (+0200) Subject: pull: support rebased upstream + fetch + pull --rebase X-Git-Tag: v1.6.4.1~6^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d44e71261f91d3cc81293e0976bb40daa8abb583?hp=d44e71261f91d3cc81293e0976bb40daa8abb583 pull: support rebased upstream + fetch + pull --rebase You cannot do a "git pull --rebase" with a rebased upstream, if you have already run "git fetch". Try to behave as if the "git fetch" was not run. In other words, find the fork point of the current branch, where the tip of upstream branch used to be, and use it as the upstream parameter of "git rebase". This patch computes the fork point by walking the reflog to find the first commit which is an ancestor of the current branch. Maybe there are smarter ways to compute it, but this is a straight forward implementation. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano ---