From: Raman Gupta <rocketraman@fastmail.fm>
To: skillzero@gmail.com
Cc: git@vger.kernel.org, trast@student.ethz.ch, gitster@pobox.com
Subject: Re: [PATCHv3] Add branch management for releases to gitworkflows
Date: Thu, 12 Nov 2009 15:30:33 -0500 [thread overview]
Message-ID: <4AFC7069.1020701@fastmail.fm> (raw)
In-Reply-To: <2729632a0911121208r1f51cf9ewb0bc23e757275f30@mail.gmail.com>
skillzero@gmail.com wrote:
>> +.Update maint to new release
>> +[caption="Recipe: "]
>> +=====================================
>> +* `git branch -f next master`
>> +* `git merge ai/topic_in_next1`
>> +* `git merge ai/topic_in_next2`
>
> Shouldn't that be something like "Update next to new release" instead
> of "maint"?
Oops. I changed the caption to "Rewind and rebuild next".
> Should it also have 'git checkout next' after the branch command so
> it's on next before merging?
Right, fixed also.
Thanks,
Raman
next prev parent reply other threads:[~2009-11-12 20:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-12 19:46 Add branch management for releases to gitworkflows rocketraman
2009-11-12 19:46 ` [PATCHv3] " rocketraman
2009-11-12 20:08 ` skillzero
2009-11-12 20:30 ` Raman Gupta [this message]
2009-11-13 22:19 ` Nanako Shiraishi
2009-11-13 22:56 ` Raman Gupta
2009-11-13 23:10 ` Nanako Shiraishi
2009-11-14 5:35 ` Raman Gupta
2009-11-14 8:59 ` Björn Gustavsson
2009-11-14 9:01 ` Nanako Shiraishi
2009-11-14 17:27 ` Raman Gupta
2009-11-15 9:14 ` Junio C Hamano
2009-11-15 17:07 ` Thomas Rast
2009-11-18 0:19 ` Raman Gupta
2009-11-18 14:59 ` Thomas Rast
2009-11-19 4:11 ` Nanako Shiraishi
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=4AFC7069.1020701@fastmail.fm \
--to=rocketraman@fastmail.fm \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=skillzero@gmail.com \
--cc=trast@student.ethz.ch \
/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).