From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 May 2011 16:06:02 GMT
Subject: Re: fast forward a branch from another
Message-ID: <7vsjsjdhud.fsf@alter.siamese.dyndns.org>
In-Reply-To: <BANLkTi=PtkDp8PNdMNi3hTwHPjFg+Jtftw@mail.gmail.com>

Eric Frederich <eric.frederich@gmail.com> writes:

> Often times I get into a situation where I have a "development" branch
> that gets ahead of say a "stable" branch.
> When I am ready to call the development branch stable this is what I do.
>
> $ git checkout stable
> $ git merge development
> $ git checkout development

Instead of switching to "stable", while still on the development, you
could do

	$ git push . HEAD:stable

which would succeed only when you are purely ahead of stable (otherwise it
will fail as you are not forcing).