Game Development Community

github command to get only changes from a branch

by Ahsan Muzaheed · in Torque 3D Professional · 04/10/2013 (4:34 am) · 8 replies

is there any github command to get only the changes without re-downloading whole t3d from this:
https://github.com/ChrisCalef/Torque3D - branch fbx
(github.com/ChrisCalef/Torque3D - branch fbx)

or
anyway to have a patch for t3d 2.0 ?


because of my unstable net connection i always fail to checkout branches from:
https://github.com/GarageGames/Torque3D/branches



About the author

Torque 3D enthusiastic since 2010.Have been working in several T3D projects besides of Unreal Engine 4 and Unity 3D. NEED a hand with your project? SHoot me a mail. http://www.garagegames.com/community/forums /viewthread/138437/


#1
04/10/2013 (4:50 am)
I have the graphical client, that syncronises automatically and if not you can press the "sync" button.
Oh, did not understand what you mean, but maybe you could trick the system by copying over the files that are identical from the other directory.
#2
04/10/2013 (5:01 am)
"but maybe you could trick the system by copying over the files that are identical from the other directory."

i am trying to checkout ChrisCalef's changes on his forked version( from github.com/GarageGames/Torque3D)

i cannot download his whole project. so trying to get his changes only.

#3
04/10/2013 (5:25 am)
ahsan
I could download it for you. I would just need a area to put it so you can get it. Well let me know you have my email address.
#4
04/10/2013 (5:38 am)
Did you add Chris's repo as a new remote in your own repo? I think that if you do than then do a `git fetch <chris's repo>` it should just download the commits that are different.
#5
04/10/2013 (6:01 am)
"Did you add Chris's repo as a new remote in your own repo? I think that if you do than then do a `git fetch <chris's repo>` "

i thought about that but problem is i do not have a stable enough net connection to download from github.so never was able to download my one.
last time it was completed 60% before my connection disconnected.
7 hours gone in vain.
not a single file was downloaded.
*************************************

@kory,
thanks.that will be a huge help.
yes.i have your mail address.
#6
04/10/2013 (6:53 am)
The way I do this is as follows:

git remote set-url upstream https://github.com/user/repo.git

git fetch upstream

git merge upstream/branch local-branch

git remote set-url upstream https://github.com/GarageGames/Torque3D.git

Then commit all changes, and there you go.
#7
04/12/2013 (10:20 am)
See? Rob is way nicer than I am - I always just link the github help for syncing to upstream repos....
#8
04/12/2013 (3:45 pm)
Hmm, I don't believe there's any way to get Chris's changes if you haven't yet got a complete copy of the repository. How do you work with the engine if you can't get it from Github?