Matt, I'm pretty sure you could do something like "git cherry-pick <commit>" to pull just that patch in. You might have to do a "git fetch" first to make sure you have the latest data from the server.
The only reason I didn't try this was that I didn't need the other changes in the commit to fix the problem I was seeing. In the end I pulled in everything from edge (I think to get a jump on the switch to authlogic). Probably not the best idea since I intend to take this live soon, but I haven't seen any problems yet. (By the way, git didn't have any issue automatically merging my change with the identical change on edge.) Bruno, While I'm on the subject, I have a few commits that I would like to send to you. Unfortunately they are currently mixed in on a branch that I have been doing heavy customization to. What do you think is the best way to handle this? I'm thinking that once I identify the commits that should go upstream, I can cherry-pick them into a new branch and then send you a pull request. Justin -- You received this message because you are subscribed to the Google Groups "CommunityEngine" 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/communityengine?hl=en.
