Re: Recording the date at which a change was pushed to Savannah

[Yuri Khan]

On Thu, Dec 4, 2014 at 3:10 AM, Stefan Monnier <address@hidden> wrote:

>>> git commit
>>> git pull
>>> <merge&commit>
>>> git push

Assuming you’re doing this on local master and the pull brings in new
commits from the remote master, this, indeed, introduces a backwards
merge.

>> That's why we recommend "git pull --rebase" in this case (and I
>> actually pull.rebase = preserve in my .gitconfig).

+1.

> There might also be a way to ask Git to generate the "merge commit" with
> its two parent swapped.

Yes and it’s called $ git branch temp; git checkout master; A: git
fetch; git reset --hard origin/master; git merge temp; git push origin
master || goto A; git branch --delete temp (retroactively create a
local feature branch and merge that into fully up-to-date master).