FlightGear Git: Difference between revisions

Jump to navigation Jump to search
→‎Supporting information: http://flightgear.org/forums/viewtopic.php?f=18&t=19825#p182278
m (removed http-download-link due to "<Quix0r> had to stop distributing fgdata.bundle through HTTP as it eats a lot bandwidth per month :(")
(→‎Supporting information: http://flightgear.org/forums/viewtopic.php?f=18&t=19825#p182278)
Line 309: Line 309:
  git branch -t -l release/2.6.0 origin/release/2.6.0
  git branch -t -l release/2.6.0 origin/release/2.6.0
  git checkout -b release/2.6.0
  git checkout -b release/2.6.0
=== Resetting the repository ===
If you find yourself having constant trouble with GIT and being contstantly asked to "rebase" your commitments, please don't delete anything, instead follow AndersG's instructions below.
If you have a local clone of fgdata you have everything at hand - starting over is just creating a new local branch that tracks master, e.g.:
<pre>
git branch my-new-master origin/master
git checkout my-new-master
</pre>
And update it to latest with (I recommend using --rebase in the future since that will keep your local commits after all up stream commits):
'''git pull --rebase'''
Use
<pre>
git status
</pre>
and
<pre>
git diff
</pre>
to investigate what ever uncommitted changes you may have in your tree.
If you want to throw all such changes away, use '''git reset --hard'''
Or you can use '''git stash''' to save them for later.
If you have an old branch with your work and want to reapply selected commits to the new one, git cherry-pick is a useful command.


=== Git tutorials and resources ===
=== Git tutorials and resources ===

Navigation menu