Re: [Git plugin] Where in the code is the actual git merge command ?

2013-07-09 Thread michaelsdev
Thank you Ivan and nicolas. I think now the call of (high level) git.merge at gitplugin https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/GitSCM.java#L1160 corresponds with (low level) git-client-plugin's

Re: [Git plugin] Where in the code is the actual git merge command ?

2013-07-07 Thread Ivan Kalinin
Looks like it is here: https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/GitSCM.java#L1160 On Saturday, July 6, 2013 1:46:56 AM UTC+4, michaelsdev wrote: Hi, Where in the code is the actual git merge command ? I could not find the place where it is

Re: [Git plugin] Where in the code is the actual git merge command ?

2013-07-07 Thread nicolas de loof
git plugin relies on git-client plugin for repo commands execution 2013/7/7 Ivan Kalinin pupss...@gmail.com Looks like it is here: https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/GitSCM.java#L1160 On Saturday, July 6, 2013 1:46:56 AM UTC+4, michaelsdev

[Git plugin] Where in the code is the actual git merge command ?

2013-07-05 Thread michaelsdev
Hi, Where in the code is the actual git merge command ? I could not find the place where it is executed. Thanks a lot Michael -- You received this message because you are subscribed to the Google Groups Jenkins Developers group. To unsubscribe from this group and stop receiving emails from