8,807
edits
(+ commiting changes) |
|||
Line 93: | Line 93: | ||
# Update your <tt>FlightGear/data/</tt> directory, to match it with the binary. For smooth operations, it is very important to have data and a binary from matching dates! | # Update your <tt>FlightGear/data/</tt> directory, to match it with the binary. For smooth operations, it is very important to have data and a binary from matching dates! | ||
## Navigate to <tt>FlightGear/data/</tt> directory and open Git Bash. | ## Navigate to <tt>FlightGear/data/</tt> directory and open Git Bash. | ||
## Run git reset --hard to revert any local changes. <font color="red">'''Note: this will delete all local changes! If you made local changes, make sure to backup those first, outside your | ## Run ''git reset --hard'' to revert any local changes. <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!'''</font> | ||
## Run | ## Run ''git pull'' and let it update, this can take a while. | ||
==Commiting changes== | |||
<font color="red">'''INCOMPLETE AS OF NOW'''</font> | |||
As a developer, you probably want to share your work with the world. For FlightGear, most developers do this by commiting stuff to the Git repository. | |||
# Register an account at [http://gitorious.org Gitorious]. | |||
# [http://gitorious.org/fg/fgdata/clone Clone fgdata]. | |||
# 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. | |||
# Now, ''git add filename'' the files you want to include in the commit but that are currently listed as "untracked". After adding a couple of files, redo step 4 to update the untracked list. | |||
# 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. |