392
edits
FlightGear Git: Difference between revisions
m
updating git repo using "fetch" instead of "pull"
m (→Some more helpful commands: tracking a release branch) |
m (updating git repo using "fetch" instead of "pull") |
||
| Line 111: | Line 111: | ||
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: | ||
git fetch # update repo | |||
git checkout master # switch to master branch | git checkout master # switch to master branch | ||
git | git rebase origin/master # update master branch | ||
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 | ||