20
edits
FlightGear Git: Difference between revisions
Jump to navigation
Jump to search
→Local Branch
| Line 96: | Line 96: | ||
'''<code>cd</code>''' into the repositories folder, e.g. fgdata: | '''<code>cd</code>''' into the repositories folder, e.g. fgdata: | ||
;<code>git checkout -b master.local master</code> | ;<code>git checkout -b master.local master</code> | ||
: a new branch <tt>master.local</tt> is created out of the <tt>master</tt> branch and set as the active one. You may now apply your individual stuff there and start FlightGear to verify the changes are | : a new branch <tt>master.local</tt> is created out of the <tt>master</tt> branch and set as the active one. You may now apply your individual stuff there and start FlightGear to verify the changes are proper. | ||
If you conclude they are, you have to tell git about those changes: | If you conclude they are, you have to tell git about those changes: | ||
| Line 108: | Line 108: | ||
: '''<tt>[u]pdate</tt>''' is the next step and will update the altered and ''tracked'' files to the index in the same manner as explained in <tt>add</tt> untracked paths above. | : '''<tt>[u]pdate</tt>''' is the next step and will update the altered and ''tracked'' files to the index in the same manner as explained in <tt>add</tt> untracked paths above. | ||
;<code>git commit</code> | ;<code>git commit</code> | ||
: will commit the ''indexed'' updates to the ''master.local'' branch. It opens a list of the updates in your standard editor. You may add a comment to that file describing the object of the commit. Save and exit the editor. You have now | : will commit the ''indexed'' updates to the ''master.local'' branch. It opens a list of the updates in your standard editor. You may add a comment to that file describing the object of the commit. Save and exit the editor. You have now committed your changes inside the ''working tree'' to your personal branch. | ||
To update that personal branch from the remote one do the following steps: | To update that personal branch from the remote one do the following steps: | ||
| Line 115: | Line 115: | ||
git checkout master.local # switch back to the individual branch | git checkout master.local # switch back to the individual branch | ||
git rebase master # update it | git rebase master # update it | ||
==== Some more helpful commands ==== | ==== Some more helpful commands ==== | ||