FlightGear Git on Windows: Difference between revisions

Jump to navigation Jump to search

FlightGear Git on Windows (view source)

Revision as of 21:43, 13 December 2010

357 bytes added ,  13 December 2010
update to support local branches, thanks to Jester.
m (add Hudson build server)
(update to support local branches, thanks to Jester.)
Line 111: Line 111:
# Click the "Add SSH key" button and paste the content of the .pub file. Follow the instructions on the screen.
# Click the "Add SSH key" button and paste the content of the .pub file. Follow the instructions on the screen.
# Congratulations on finishing the setup procedure!
# Congratulations on finishing the setup procedure!
{{WIP}}


'''Required with each update:'''
'''Required with each update:'''
# 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.
# ''git checkout -b rendering-checkboxes''
# 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''.
# ''git checkout master''
# 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.
# ''git reset --hard HEAD''
# Run ''git commit -m "Summary of the update"'' (don't forget the " symbols!). Where you should write a short summary on what you changed.
# ''git pull'' to make sure you can commit against the latest Git.
# 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.
# '''git push <url>  +master'''
# Switch to your local branch, by ''git checkout rendering-checkboxes''
# Rebase your changes by: ''git rebase master''
# Now run'''git push fgdataclone rendering-checkboxes''', 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!
Line 124: Line 129:
# 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 [http://gitorious.org/+flightgear-developers contributor] and wait till he accepts your merge request ;)
# Now, all you have to do is contact a [http://gitorious.org/+flightgear-developers contributor] and wait till he accepts your merge request ;)
<!--
# 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 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.
-->
Retrieved from "https://wiki.flightgear.org/Special:MobileDiff/26611"

Navigation menu