From: Tero Tilus <tero@tilus.net>
To: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] What's your workflow?
Date: Tue, 29 Dec 2009 23:58:47 +0200 [thread overview]
Message-ID: <1262123514-sup-7661@tilus.net> (raw)
In-Reply-To: <1262118240-sup-4202@ntdws12.chass.utoronto.ca>
Ben Walton, 2009-12-29 22:40:
> Maybe something like Stacked Git would work for you?
> http://www.procode.org/stgit/
Now _that_ is something i've been dreaming of! Thanks a lot. Even if
I don't end up using stgit on sup development, I know I'll use it in
quite a few other places.
> Alternately, if you want to stick to plain git, I'd recommend
> something like:
>
> origin/master -> master
> origin/next -> next
> |
> \ mybranch
>
> Where 'mybranch' collects your locally desired deviations.
Does it "just work" if I have feature branches off of master which are
merged to mybranch and the feature patches get accepted and appear to
next?
--
Tero Tilus ## 050 3635 235 ## http://tero.tilus.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 21:58 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 [this message]
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
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=1262123514-sup-7661@tilus.net \
--to=tero@tilus.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