From: Raman Gupta <rocketraman@fastmail.fm>
To: Nanako Shiraishi <nanako3@lavabit.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] Add feature release instructions to MaintNotes addendum
Date: Thu, 26 Mar 2009 09:51:45 -0400 [thread overview]
Message-ID: <49CB8871.2020605@fastmail.fm> (raw)
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
next prev parent reply other threads:[~2009-03-26 13:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-26 1:56 [PATCH 1/2] Add feature release instructions to MaintNotes addendum rocketraman
2009-03-26 1:56 ` [PATCH 2/2] Add feature release instructions to gitworkflows man page rocketraman
2009-03-26 6:48 ` Junio C Hamano
2009-03-26 14:35 ` Raman Gupta
[not found] ` <20090326121017.6117@nanako3.lavabit.com>
2009-03-26 13:51 ` Raman Gupta [this message]
2009-03-26 20:28 ` [PATCH 1/2] Add feature release instructions to MaintNotes addendum Junio C Hamano
2009-03-26 21:37 ` Raman Gupta
-- strict thread matches above, loose matches on Subject: below --
2009-03-30 5:35 rocketraman
2009-03-30 6:56 ` Junio C Hamano
2009-03-30 17:57 ` Raman Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49CB8871.2020605@fastmail.fm \
--to=rocketraman@fastmail.fm \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).