Here is the quick steps to make a branch to your own repo that has his changes. This is a better alternative than cloning his repo to a differenct directory if you possibly want to send some changes as a pull request (well its easier this way, not impossible to send it from a clean clone, youll just have to do these steps at some point). Additionally you will get a branch with his changes and can use that from now on if you want, its stored in your repo for good.
cd /your/tundra-clone # git:// means you have pull but not push permissions to this repo. # If he adds you as a contributor you would use the git @ url and you could then push also. git remote add theflyboy git://github.com/th3flyboy/naali.git # Fetch all branch updates from this repo. Does not do anything with them yet, just an update. git fetch theflyboy # 1) Make a new local branch (-b) to your repo and set it tracking his fix branch. # You can skip -b and the last tracking param to make a new branch see #2. git checkout -b linux-build-fixes theflyboy/th3flyboy-linuxmint # 2) If you dont want to make a new branch but merge his work on top of your existing branch. # Don't do this if you did #1, its an alternative path. git cheackout my-existing-branch git merge theflyboy/th3flyboy-linuxmint # Now you have a branch with his stuff in your repo. Lets do some changes... git commit -a -m "Fixed the thing i mentioned in the mailing lists for you." # 1) Pushing to your own repo into a new branch that you can make nice pull request to him. # Note that "origin" is used here, thats the default and you can use it if you havent renamed # your origin remote where you cloned the repo. # git push <repo> <my-local-branch-name>[OPTIONAL :<remote-branch-name>} # usually you want to define at least the first param so it wont push all the local branches like a mad man :) # # After, go to the github site, go to the branch page, hit pull request on top. There are pull down menus for the # target, select th3flyboy and his branch th3flyboy-linuxmint. Actually this is all automatic if you defined the # last tracking in 'git checkout -b' earlier, github should already know where to send the pull request. git push origin linux-build-fixes:linux-build-fixes # 2) If you would have collaborator right in another fork, let say th3flyboys repo. # Note that you cannot do this now, but just want to cover both the use cases. # This would push directly to his repo, from your linux-build-fixes into his th3flyboy-linuxmint # Its a nice way of working for smaller projects, but for example in Tundra we decided to start using # pull requests instead of people directly pushing stuff to our "main repo" git://github.com/realXtend/naali.git git remote add theflyboys-repo [email protected]/th3flyboy/naali.git git push theflyboys-repo linux-build-fixes:th3flyboy-linuxmint Git is not too hard, just knowing a few commands will get you far :) Best regards, Jonne Nauha Adminotech developer On Sun, Aug 26, 2012 at 9:32 AM, glenalec <[email protected]> wrote: > That's got it! > Thanks. > (I'm slowly getting the hang of this :-D ) > > > On Sunday, 26 August 2012 16:00:11 UTC+10, Peter C. wrote: > >> That was a direct link to the github page for the branch, not a checkout >> url. I have to push some stuff later to shift a few cmake changes around, >> but the current git should work. >> >> Just make sure to use th3flyboy-linuxmint and not >> th3flyboy-linuxmintbuild, i stupidly did two branches and the latter does >> not have the fixes. >> -- >> Sent from my Android phone with K-9 Mail. Please excuse my brevity. >> >> glenalec <[email protected]> wrote: >>> >>> Thanks Toni. Will try that. >>> >>> ... >>> >>> Oops. Does this mean Peter has to do something his end?: >>> >>> $ git clone https://github.com/th3flyboy/** >>> naali/tree/th3flyboy-linuxmint<https://github.com/th3flyboy/naali/tree/th3flyboy-linuxmint> >>> ** >>> Cloning into 'th3flyboy-linuxmint'... >>> fatal: https://github.com/th3flyboy/**naali/tree/th3flyboy-** >>> linuxmint/info/refs<https://github.com/th3flyboy/naali/tree/th3flyboy-linuxmint/info/refs>not >>> found: did you run git update-server-info on the server? >>> >>> On Sunday, 26 August 2012 15:26:57 UTC+10, antont wrote: >>>> >>>> On Sat, 2012-08-25 at 15:33 -0700, glenalec wrote: >>>> > Thanks for that Peter! >>>> > I will have another go when the mainline is updated (I have access to >>>> > a Windows system at work during the week, but it will be nice to have >>>> > a version running at home for evenings/weekends). >>>> >>>> Thanks indeed -- my situation is similar, have windows boxes for Tundra >>>> at the studio, but usually use Linux only at home (for work) and for >>>> quite long exclusively for Tundra dev actually (on Ubuntu). >>>> >>>> One remark: there's a bit of queue of pull requests, and at least I'll >>>> be very busy working towards an article deadline next week, so is >>>> possible that testing linux build things takes a while (though there >>>> are >>>> many at chiru.cie.fi etc. who build Tundra on Linux daily who may >>>> check >>>> that out). >>>> >>>> My point finally: It can be helpful if you don't wait for the mainline, >>>> but just pull from Peter directly to your copy. It is quite easy with >>>> git. It can help with the review of the pull request if you can also >>>> comment on how it worked. >>>> >>>> Cheers, >>>> ~Toni >>>> >>>> -- >>> http://groups.google.com/**group/realxtend<http://groups.google.com/group/realxtend> >>> http://www.realxtend.org >> >> -- > http://groups.google.com/group/realxtend > http://www.realxtend.org > -- http://groups.google.com/group/realxtend http://www.realxtend.org
