8,807
edits
FlightGear Git on Windows: Difference between revisions
Jump to navigation
Jump to search
m
→Commiting changes
(update to support local branches, thanks to Jester.) |
|||
| Line 115: | Line 115: | ||
'''Required with each update:''' | '''Required with each update:''' | ||
Note, <url> is the line that you get by clicking SSH on your fgdata clone page at Gitorious (should be something like ''git@gitorious.org:~your/fg/yours-fgdata.git''). | |||
# Browse to the root of your updates (if you are commiting a new aircraft, this will be Aircraft/.../) and open Git Bash. | # Browse to the root of your updates (if you are commiting a new aircraft, this will be Aircraft/.../) and open Git Bash. | ||
# ''git checkout -b rendering-checkboxes'' | # ''git checkout -b rendering-checkboxes'' | ||
| Line 120: | Line 122: | ||
# ''git reset --hard HEAD'' | # ''git reset --hard HEAD'' | ||
# ''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. | ||
# Switch to your local branch, by ''git checkout rendering-checkboxes'' | # Switch to your local branch, by ''git checkout rendering-checkboxes'' | ||
# Rebase your changes by: ''git rebase master'' | # Rebase your changes by: ''git rebase master'' | ||
# Now run | # Now run ''git push <url> rendering-checkboxes''. You will have to enter your SSH passphrase again. | ||
# Check that the commit to your fgdata clone is recognised by Gitorious. | # Check that the commit to your fgdata clone is recognised by Gitorious. | ||
# Click the "Request merge" button on your fgdata clone page. Loading the next page can take a while, as it will list all commits of the past years! | # Click the "Request merge" button on your fgdata clone page. Loading the next page can take a while, as it will list all commits of the past years! | ||