From: in-gitvger@baka.org
Date: Thu, 06 Oct 2011 20:31:57 GMT
Subject: Re: Pull --rebase looses merge information
Message-ID: <201110062031.p96KVvsv018248@no.baka.org>
In-Reply-To: <DECF417E-50BB-4963-965C-BEF1B5C95DAC@mac.com>


In message <DECF417E-50BB-4963-965C-BEF1B5C95DAC@mac.com>, Duane Murphy writes:

    $ git merge topic
    $ git pull 
        merge by rebase; implied by config
    $ git push

    The result of this process is that the file changes are pushed but
    the reference back to the topic branch has been lost. This makes
    it appear as though the topic branch has not been merged properly.

[...]

    Is there a bug here? Is there some way to avoid this situation
    without sacrificing the benefits of pull --rebase?

Yes, but it currently is annoying.

Instead of `git pull --rebase` you need to run
`git fetch && git rebase -p @{u}`

It would be very nice if the -p argument to rebase could be
automatically included in the `git pull --rebase`.

I personally believe all pull should be --rebase, all merges should be
--no-ff, and all rebases should be -p.  At least by default.  But that
is just me.

					-Seth Robertson