6,566
edits
FGAddon: Difference between revisions
Jump to navigation
Jump to search
→Pushing to FGAddon: Expanded and improved the instructions.
(→Obtaining aircraft: Added a new section to cross-link to Howto:Install aircraft.) |
(→Pushing to FGAddon: Expanded and improved the instructions.) |
||
| Line 982: | Line 982: | ||
<syntaxhighlight lang="bash"> | <syntaxhighlight lang="bash"> | ||
git svn rebase | git svn rebase | ||
</syntaxhighlight> | |||
To see the commits in the <code>master</code> branch which are not in the <code>fgaddon</code> branch, type one of: | |||
<syntaxhighlight lang="bash"> | |||
git log HEAD..master | |||
git log HEAD..master --pretty=oneline | |||
</syntaxhighlight> | </syntaxhighlight> | ||
| Line 990: | Line 996: | ||
git cherry-pick <commit hash 3> | git cherry-pick <commit hash 3> | ||
... | ... | ||
</syntaxhighlight> | |||
Or to cherry-pick a range of commits: | |||
<syntaxhighlight lang="bash"> | |||
git cherry-pick <commit hash 1>^..<commit hash 8> | |||
</syntaxhighlight> | </syntaxhighlight> | ||
| Line 998: | Line 1,009: | ||
</syntaxhighlight> | </syntaxhighlight> | ||
Send the changes to FGAddon and switch back to the master branch: | Send the changes to FGAddon, send the git <code>fgaddon</code> branch changes to the remote git repository, and switch back to the master branch: | ||
<syntaxhighlight lang="bash"> | <syntaxhighlight lang="bash"> | ||
git svn dcommit | git svn dcommit | ||
git push | |||
git checkout master | git checkout master | ||
</syntaxhighlight> | |||
Finally merge in the git svn commits with their new hashes from the <code>fgaddon</code> branch, and send it to the remote git repository: | |||
<syntaxhighlight lang="bash"> | |||
git merge fgaddon | |||
git push | |||
</syntaxhighlight> | </syntaxhighlight> | ||