But you do not have to do it that way right? We could keep master to be the same as trunk.
G On Mon, Mar 18, 2013 at 1:44 PM, Ivan Habunek <[email protected]>wrote: > On 18 March 2013 18:27, Ralph Goers <[email protected]> wrote: > > Where are the processes that you use with Git documented? While I'm > very comfortable with SVN I am only passable on Git - I can happily work > with other people's stuff but I'm not sure what it takes to integrate > changes people make from their forks. > > Here's an example for accepting other people's work. > > We have an issue on the tracker: > https://issues.apache.org/jira/browse/LOG4PHP-207 > > I got a patch from a person I trust and he asked me to merge it: > 0001-LOG4PHP-207-Using-class-MongoClient-instead-of-Mongo.patch > > To apply the patch you download it to your project and run: > git am --signoff > 0001-LOG4PHP-207-Using-class-MongoClient-instead-of-Mongo.patch > > By adding --signoff, you will get a line similar to this in your commit > message: > Signed-off-by: Ivan Habunek <[email protected]> > > Vladimir also used --signoff when creating the patch (see the > contributor guidelines I sent in the previous mail), so you get two > lines at the bottom of the commit message: > Signed-off-by: Vladimir Gorej <[email protected]> > Signed-off-by: Ivan Habunek <[email protected]> > > That way, it's clearly visible who did participated in creating and > merging the commit. > > Here's the commit in our repo: > > https://git-wip-us.apache.org/repos/asf?p=logging-log4php.git;a=commit;h=f6d602f465dfb78aef67b196ac5456ff6c2b945f > > Regards, > Ivan > -- E-Mail: [email protected] | [email protected] JUnit in Action, 2nd Ed: <http://goog_1249600977>http://bit.ly/ECvg0 Spring Batch in Action: <http://s.apache.org/HOq>http://bit.ly/bqpbCK Blog: http://garygregory.wordpress.com Home: http://garygregory.com/ Tweet! http://twitter.com/GaryGregory
