From: Raman Gupta <rocketraman@fastmail.fm>
Date: Thu, 26 Mar 2009 13:51:45 GMT
Subject: Re: [PATCH 1/2] Add feature release instructions to MaintNotes addendum
Message-ID: <49CB8871.2020605@fastmail.fm>
In-Reply-To: <20090326121017.6117@nanako3.lavabit.com>

Nanako Shiraishi wrote:
> Quoting rocketraman@fastmail.fm:
> 
>> + - The 'maint' branch is updated to the new release.
>> +
>> +     $ git checkout maint
>> +     $ git merge master
>> +
>> +   This is equivalent to deleting maint and recreating it from
>> +   master, but it preserves the maint reflog.
> 
> After giving a recipe that is better than an alternative, what's
> the point of describing an inferior alternative as "equivalent",
> when it is obviously not "equivalent"?

Is this better:

The resulting maint tree is equivalent to deleting maint and
recreating it from the tip of master, but merging from master
preserves the maint reflog.

Cheers,
Raman