git cherry-pick is what you're after. You can even do it graphically with gitk.
git checkout <product branch> gitk --all right click on the changes you want and click cherry pick. If there is a conflict, it will tell you and you need to exit gitk and resolve it manually and commit using "git commit -c <id of commit being cherry-picked> The -c retains the commit information. On Thu, Sep 25, 2008 at 5:02 AM, TomSW <[EMAIL PROTECTED]> wrote: > > 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 > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/git-users?hl=en -~----------~----~----~----~------~----~------~--~---
