On Sun, 5 Sep 2010, Jon S. Berndt wrote: > How does one do updates via git? And how will we know when the propeller has > been fixed?
Hi Jon, If you don't do local changes updating is as easy as cd:ing into fgdata (and the respective source repositories) and type 'git pull'. 'git log' will list all changes with the latest first (it is automatically using a pager so there is no need to pipe the output to more or similar). If you do local changes you can commit them locally using 'git add' and 'git commit'. 'git status' and 'git diff' are also useful commands. To merge your local changes with upstream commits on the origin master branch you can either do git fetch; (downloads new changes done to the remote branches) git merge origin/master (origin/next for the source repros) (merges the branch origin/master into your current local branch) or, and this is my preferred method, git fetch; git rebase origin/master (origin/next for the source repros) The later approach keeps your local changes first (most recent) in the history of your local branch. Essentially as if you committed all your local changes on top of the most recent state of upstream branch. However, a branch that you rebase regularly should not be published for others since each rebase changes the commit ids your local commits in the branch. Btw. all git commands should display their respective manual page by 'git command --help' One of many good resources on git usage: http://progit.org/book/ Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ This SF.net Dev2Dev email is sponsored by: Show off your parallel programming skills. Enter the Intel(R) Threading Challenge 2010. http://p.sf.net/sfu/intel-thread-sfd _______________________________________________ Flightgear-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/flightgear-devel
