8,807
edits
FlightGear Git on Windows: Difference between revisions
Jump to navigation
Jump to search
m
no edit summary
mNo edit summary |
|||
| Line 115: | Line 115: | ||
'''Required with each update:''' | '''Required with each update:''' | ||
* <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''). | |||
* <branch name> is the name of your local branch. | |||
# 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 | # ''git checkout -b <branch name>'' | ||
# ''git checkout master'' | # ''git checkout master'' | ||
# ''git reset --hard HEAD'' | # ''git reset --hard HEAD'' | ||
| Line 124: | Line 125: | ||
# ''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. | ||
# Switch to your local branch, by ''git checkout rendering-checkboxes'' | # Switch to your local branch, by ''git checkout rendering-checkboxes'' | ||
# | # Run ''git status -- .'' to show the status of the current directory. | ||
# Now run ''git push <url> | # Now, ''git add filename'' the files you want to include in the commit but that are currently listed under "Changed but not updated" or under "Untracked files". After adding a couple of files, redo step 4 to update the untracked list. Files that are listed as "deleted" can be added to the "to be commited" list with ''git rm filename''. | ||
# Eventually, you will have everything you want to commit listed under "Changes to be committed:". You can verify what you have staged for committing by running ''git diff --cached'' which will show exactly what would be committed by git commit in the form of a diff. | |||
# Run ''git commit -m "Summary of the update"'' (don't forget the " symbols!). Where you should write a short summary on what you changed. | |||
# Now run ''git push <url> <branch name>''. 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! | ||