| | 1 | = Branch Overview = |
| | 2 | |
| | 3 | There are three types of branches in the QtWebKit Git repository: |
| | 4 | |
| | 5 | * <username>/* : This is where developers publish their changes. You can have as many so-called topic branches as you like. For example holger/crash-fix would be a name for such a topic branch. |
| | 6 | * qtwebkit: This is the main development branch. Currently only Lars and Simon can update this branch. If you feel comfortable enough with Git we can add you. |
| | 7 | * svn/* such as svn/master or svn/Safari-3-branch. The branches prefixed with svn/ are read-only |
| | 8 | and are mirrored from the WebKit Subversion repository. |
| | 9 | |
| | 10 | = Howto = |
| | 11 | |
| | 12 | == Getting Started == |
| | 13 | |
| | 14 | * Clone your git repository from {{{git+ssh://git@code.staikos.net/srv/git/webkit}}} |
| | 15 | * After that you will have one local branch called {{{qtwebkit}}}. |
| | 16 | |
| | 17 | == Step-by-step instructions == |
| | 18 | |
| | 19 | (Note: Substitute {{{simon/crash-fix}}} accordingly) |
| | 20 | |
| | 21 | * Create a local topic branch: {{{git checkout -b simon/crash-fix origin/qtwebkit}}} |
| | 22 | * After that you will be on a local {{{simon/crash-fix}}} branch. |
| | 23 | * Now you can hack away and commit as many changes as you want. |
| | 24 | * To publish your changes for the first time run the following command: {{{git push origin simon/crash-fix}}} |
| | 25 | * You can continue hacking and if you want to publish more changes you can just run {{{git push}}} |
| | 26 | * If you want to merge the latest changes from the {{{qtwebkit}}} branch run this: |
| | 27 | {{{ |
| | 28 | git fetch |
| | 29 | git merge origin/qtwebkit |
| | 30 | }}} |
| | 31 | * When you are happy with your changes and they have been merged into the {{{qtwebkit}}} branch you can delete your branch on the public repository using {{{git push origin :simon/crash-fix}}} |
| | 32 | * After deleting the branch on the public repository you can also delete it locally: |
| | 33 | * Switch to a different branch, such as {{{qtwebkit}}}: {{{git checkout qtwebkit}}} |
| | 34 | * Delete the branch: {{{git branch -D simon/crash-fix}}} |
| | 35 | |
| | 36 | == Switching from the Trolltech Labs repository == |
| | 37 | |
| | 38 | All you have to do is to adjust your {{{origin}}}. Edit the {{{.git/config}}} file and look for the {{{[remote "origin"]}}} section. Change the the {{{url = ...}}} line to read {{{url = git+ssh://git@code.staikos.net/srv/git/webkit}}} |
| | 39 | |
