8,807
edits
FlightGear Git on Windows: Difference between revisions
Jump to navigation
Jump to search
m
no edit summary
m (Reverted edits by Gijs (talk) to last revision by BotFlightGear) |
mNo edit summary |
||
| Line 121: | Line 121: | ||
# ''git checkout -b <branch name>'' | # ''git checkout -b <branch name>'' | ||
# ''git checkout master'' | # ''git checkout master'' | ||
# ''git reset --hard HEAD'' | # ''git reset --hard HEAD'' <font color="red">'''Note: this will delete all local changes! If you made local changes, make sure to backup those first, outside your FlightGear data directory! Or, better, learn to commit your changes to your local git repository.''' Make a copy of our to-be-commited work somewhere out of your data/ directory before doing this, and move it back in after pulling.</font> | ||
## Run ''git pull'' and let it update, this can take a while. | |||
# ''git pull'' to make sure you can commit against the latest Git. | # ''git pull'' to make sure you can commit against the latest Git. | ||
# ''git push <url> +master'' You will have to enter your SSH passphrase. Press Enter when you're done (note: your passphrase is hidden!). Git will now commit your work, this can take a long time, depending on the number of commits that have been made since you cloned fgdata. | # ''git push <url> +master'' You will have to enter your SSH passphrase. Press Enter when you're done (note: your passphrase is hidden!). Git will now commit your work, this can take a long time, depending on the number of commits that have been made since you cloned fgdata. | ||