821
edits
FlightGear Git on Windows: Difference between revisions
Jump to navigation
Jump to search
m
→Commiting changes
| Line 103: | Line 103: | ||
# 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. | ||
# Run ''git status -- .'' to show the status of the current directory. | # Run ''git status -- .'' to show the status of the current directory. | ||
# Now, ''git add filename'' the files you want to include in the commit but that are currently listed | # 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. | ||
# 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"''. Where you should write a short summary on what you changed. | # Run ''git commit -m "Summary of the update"''. Where you should write a short summary on what you changed. | ||
# Now run ''git push fgdataclone'', replacing fgdataclone with 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'') 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. | # Now run ''git push fgdataclone'', replacing fgdataclone with 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'') 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. | ||
# 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! | ||
# Once again write a short summary (could be the same as used with git commit), but this time, also write an | # Once again write a short summary (could be the same as used with git commit), but this time, also write an explanation of your merge request (what does it do). Make sure you set target repository to fgdata! | ||
# Tick the box in front of your commit and click the "Create merge request" button. | # Tick the box in front of your commit and click the "Create merge request" button. | ||
# Now, all you have to do is contact a contributor and wait till he accepts your merge request ;) | # Now, all you have to do is contact a contributor and wait till he accepts your merge request ;) | ||