From: Uwe B. <ou...@ma...> - 2016-03-21 13:52:11
|
Hi Simon > On Sun, 20 Mar 2016, at 08:40 AM, Uwe Brauer wrote: > Hi Uwe, > If you're happy with the commit you can press the merge button on the > github web UI then push the changes back to SF. As dlebrecht said, this > is the first test of accepting changes from github back onto SF. Ok, applied the patch but I had to change the config file slightly: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] # url = git://git.code.sf.net/p/matlab-emacs/src # org setting url = ssh://ou...@gi.../p/matlab-emacs/src fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master [remote "github"] url = gi...@gi...:matlab-mode/mirror.git fetch = +refs/heads/*:refs/remotes/github/* And then indeed: git pull github master git push origin master Worked. Perfect So Fritz[1]: I applied your patch, thanks Uwe Footnotes: [1] I presume your name is Fritz and your family name da silva: Portuguese or Brazilian, I presume? |