Changes between Version 4 and Version 5 of UsingGitWithWebKit


Ignore:
Timestamp:
Nov 23, 2007 5:30:29 AM (14 years ago)
Author:
Simon Hausmann
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitWithWebKit

    v4 v5  
    11[[PageOutline]]
    2 
    3 = Branch Overview =
    4 
    5 There are three types of branches in the QtWebKit Git repository:
    6 
    7  * <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.
    8  * 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.
    9  * svn/* such as svn/master or svn/Safari-3-branch. The branches prefixed with svn/ are read-only
    10    and are mirrored from the WebKit Subversion repository.
    11 
    12 = Howto =
    13 
    14 == Getting Started ==
    15 
    16  * Clone your git repository from {{{git+ssh://git@code.staikos.net/srv/git/webkit}}}
    17  * After that you will have one local branch called {{{qtwebkit}}}.
    18 
    19 == Step-by-step instructions ==
    20 
    21 (Note: Substitute {{{simon/crash-fix}}} accordingly)
    22 
    23  * Create a local topic branch: {{{git checkout -b simon/crash-fix origin/qtwebkit}}}
    24  * After that you will be on a local {{{simon/crash-fix}}} branch.
    25  * Now you can hack away and commit as many changes as you want.
    26  * To publish your changes for the first time run the following command: {{{git push origin simon/crash-fix}}}
    27  * You can continue hacking and if you want to publish more changes you can just run {{{git push}}}
    28  * If you want to merge the latest changes from the {{{qtwebkit}}} branch run this:
    29 {{{
    30 git fetch
    31 git merge origin/qtwebkit
    32 }}}
    33  * 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}}}
    34  * After deleting the branch on the public repository you can also delete it locally:
    35    * Switch to a different branch, such as {{{qtwebkit}}}: {{{git checkout qtwebkit}}}
    36    * Delete the branch: {{{git branch -D simon/crash-fix}}}
    37 
    38 == Switching from the Trolltech Labs repository ==
    39 
    40 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}}}
    412
    423= Tips and Tricks for using Git with WebKit =