Re: tracking branch for a rebase

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 5, 2009, 17:59 UTC
Message-ID: <7v4orh1ddt.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20090905140127.GA29037@atjola.homenet>

Björn Steinbrink <B.Steinbrink@gmx.de> writes:

> For me, the confusion would arise from the fact that "git rebase"
> (without args) would seem like a "pull --rebase" without the fetch, but
> isn't.

It is true that one popular way to explain 'git pull' is:

    'git pull' is 'git fetch' followed by 'git merge'.

These three command names in the sentence merely refer to the concepts of what they do.

It is left up to the readers to extend the concepts to concrete command line to suit the needs for their situation. For example you would restate the above general explanation into this form:

       'git pull git.git master' is 'git fetch git.git master' followed by
       'git merge FETCH_HEAD'

when updating your tree with the master branch of upstream git.git repository.

Don't confuse the general concept with concrete syntax.

    'git pull --rebase' is 'git fetch' followed by 'git rebase'

is exactly the same deal.