From: William Morgan <wmorgan-sup@masanjin.net>
To: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] What's your workflow?
Date: Tue, 29 Dec 2009 12:43:15 -0800 [thread overview]
Message-ID: <1262118710-sup-1729@masanjin.net> (raw)
In-Reply-To: <1262117270-sup-1009@tilus.net>
Reformatted excerpts from Tero Tilus's message of 2009-12-29:
> Wiki page just doesn't say anything on how to have your own daily-sup
> branch (master or next + a set of own and others' patches) and how to
> keep that up-to-date with upstream while your develop your own patches
> (which are supposed to live in topic branches).
You should be able to make a daily-sup branch off of (say) next, apply
all your patches, and whenever next changes and you want to update,
rebase like so:
$ git checkout next
$ git pull
$ git checkout daily-sup
$ git rebase next
If you have feature branches merged into daily-sup, I think you need to
use `git rebase -p next` to get it to recreate those merges. But I've
never gotten that complex.
(You could also just merge in next each time, which might be easier.
Rebase has the advantage of keeping your patch set up to date with the
remote branch, though, which might be nice if you decide to publish
them.)
--
William <wmorgan-sup@masanjin.net>
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
next prev parent reply other threads:[~2009-12-29 20:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-29 19:34 Tero Tilus
2009-12-29 19:41 ` Edward Z. Yang
2009-12-29 19:58 ` William Morgan
2009-12-29 20:14 ` Tero Tilus
2009-12-29 20:40 ` Ben Walton
2009-12-29 21:58 ` Tero Tilus
2009-12-29 22:51 ` William Morgan
2009-12-29 23:03 ` Tero Tilus
2009-12-30 0:01 ` William Morgan
2009-12-29 20:43 ` William Morgan [this message]
2009-12-29 22:03 ` Tero Tilus
2009-12-29 22:33 ` William Morgan
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=1262118710-sup-1729@masanjin.net \
--to=wmorgan-sup@masanjin.net \
--cc=sup-devel@rubyforge.org \
/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