Archive of RubyForge sup-devel mailing list
 help / color / mirror / Atom feed
From: "Edward Z. Yang" <ezyang@MIT.EDU>
To: Tero Tilus <tero@tilus.net>
Cc: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] What's your workflow?
Date: Tue, 29 Dec 2009 14:41:34 -0500	[thread overview]
Message-ID: <1262115613-sup-1540@ezyang> (raw)
In-Reply-To: <1262114695-sup-9446@tilus.net>

Excerpts from Tero Tilus's message of Tue Dec 29 14:34:33 -0500 2009:
> I'm still a bit newbie with git.  I'd like to hear how do you folks
> develop/use sup.  What's your workflow?  Do you run master, next or
> some own branch?  If own, where do you fork and how do you track
> upstream and your own patches?  Detailed git commands appreciated.

When I used to maintain a few patches on top of Git (I don't think I
have any right now, since they became unnecessary when I switched
to Xapian and OfflineImap), I'd have them on top of my local next
branch; when pulling changes I'd:

    git fetch
    git rebase origin/next

I used to run master, but switched to next on advice that it was fairly
stable.

Cheers,
Edward
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel


  reply	other threads:[~2009-12-29 19:45 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 [this message]
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
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=1262115613-sup-1540@ezyang \
    --to=ezyang@mit.edu \
    --cc=sup-devel@rubyforge.org \
    --cc=tero@tilus.net \
    /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