From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 04 May 2013 18:51:46 GMT
Subject: Re: Pitfalls in auto-fast-forwarding heads that are not checked out?
Message-ID: <20130504185146.GD25863@elie.Belkin>
In-Reply-To: <CACPiFCK=8KFX++Bg+LhymorSMnWgrj5Js+-f=UYyZnNY=n9WiA@mail.gmail.com>

Martin Langhoff wrote:
> On Sat, May 4, 2013 at 3:34 AM, Johannes Sixt <j6t@kdbg.org> wrote:

>> Since git 1.8.0 you can express this check as
>>
>>     if git merge-base --is-ancestor $production_sha1 refs/heads/master
>
> Ah, that's great! Unfortunate it's not there in earlier / more widely
> used releases of git.

Another trick is to use "git push":

	git push . $production_sha1:refs/heads/master

This advances the "master" branch if

 (1) it is not the current branch, and
 (2) that update is a fast-forward

It can be convenient sometimes.

Hope that helps,
Jonathan