155
edits
FlightGear Git on Windows: Difference between revisions
Jump to navigation
Jump to search
→Commiting changes: Added rebasing section before creating the merge request
m (Rightclick > Git Bash, isn't available any more.) |
(→Commiting changes: Added rebasing section before creating the merge request) |
||
| Line 139: | Line 139: | ||
# If you used ''git commit -a'', the commit has already been created for you. Otherwise, run ''git commit -m "<commit message>"'' (quotes required), where <commit message> is the message for your commit (i.e. "747-400: Improved lightmaps"). | # If you used ''git commit -a'', the commit has already been created for you. Otherwise, run ''git commit -m "<commit message>"'' (quotes required), where <commit message> is the message for your commit (i.e. "747-400: Improved lightmaps"). | ||
# ''git push origin <branch name>'' | # ''git push origin <branch name>'' | ||
==== Rebase the development branch ==== | |||
Normally developments take some time, so the root of a development branch most likely will be outdated by the time the development is finished and a merge can be prepared. In order to make the merge easier for the contributor, it could be helpful to rebase the development branch to the current HEAD of the master. | |||
Let <branch name> be the name of the local branch you want to push, that branch contains your work. | |||
Furthermore, <tt>fgdata</tt> refers to the repository at <tt>http://book.git-scm.com/4_rebasing.html</tt>, i.e. the official repository, whereas <tt>origin</tt> refers to your personal Gitorious repository.(You can use <code>git remote -v</code> to learn about all the remotes and their names.) | |||
# Switch to that branch: <code>git checkout <branch name></code> | |||
# Rebase your branch to the current HEAD of fgdata/master: <code>git rebase fgdata/master</code> | |||
# Push your rebased development branch to your personal Gitorious repo | |||
## First try <code>git push origin</code>. If that produces some warnings about merges, you can | |||
## force it by using <code>git push origin -f</code> . | |||
For more details on what rebasing does, check out http://book.git-scm.com/4_rebasing.html. | |||
==== Creating a merge request ==== | ==== Creating a merge request ==== | ||