git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tom Schutzer-Weissmann <tom.weissmann@siscog.pt>
To: git@vger.kernel.org
Subject: Applying changes across divergent branches
Date: Wed, 24 Sep 2008 15:40:14 +0100	[thread overview]
Message-ID: <48DA514E.6060904@siscog.pt> (raw)

Hello all,

I am looking into how to apply git to some current working methods.

We tend to have two or three main branches: the development branch, and 
one or two product branches. The development branch is the cutting edge, 
and each product branches off from it.

While the product branch shares history with the development branch, not 
all changes to the development branch will get applied to the product 
branch. We tend to maintain two versions of a product at any time, 
meaning two divergent product branches.

Could we use git, or a tool based on git, to change on the development 
branch and selectively apply changes to the other branches - is it as 
simple as using git cherry-pick?

Thanks in advance,
Tom SW

             reply	other threads:[~2008-09-24 14:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-24 14:40 Tom Schutzer-Weissmann [this message]
2008-09-24 17:09 ` Applying changes across divergent branches Jeff King

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=48DA514E.6060904@siscog.pt \
    --to=tom.weissmann@siscog.pt \
    --cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).