Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
> John Keeping wrote:
>> On Thu, Sep 05, 2013 at 12:18:45PM -0700, Junio C Hamano wrote:
>
>>> I somehow thought that rebase by default looked in the reflog to do
>>> exactly that. Perhaps I am not remembering correctly.
>>
>> It just does @{upstream} by default, which tends to get messy if the
>> upstream has been rewritten.
>
> Maybe Junio is thinking of 'git pull --rebase', which walks the reflog
> until it finds an ancestor of the current branch and uses that as the
> <upstream> parameter to rebase.
You're right.
It makes me wonder why we did that one inside pull and not in
rebase, though.
--
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