Changes between Version 51 and Version 52 of UsingGitWithWebKit


Ignore:
Timestamp:
Jul 12, 2010 1:09:01 PM (14 years ago)
Author:
ojan@chromium.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • UsingGitWithWebKit

    v51 v52  
    9595== WebKit Script support for Git ==
    9696
     97 * Important git config settings for preparing ChangeLogs.
     98{{{
     99git config --global user.name "Foo Bar"
     100git config --global user.email "foo@webkit.org"
     101}}}
     102
    97103webkit-patch and check-webkit-style commands all work with git. By default all webkit-patch commands will treat all changes in your branch as a single commit (i.e. all local commits + working copy changes get uploaded/committed as a single commit). To operate on a specific commit, use --git-commit=commitish or "-g commitish". commitish can be a single commit (e.g. HEAD~1), a commit range (e.g. HEAD~3..HEAD~1, operates on HEAD~2 and HEAD~1 as a single commit) or the working copy (i.e., HEAD..).
    98104
    … …  
    100106of the specific things you can do with them:
    101107
     108 * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs (assumes resolve-ChangeLogs is in your path)
     109{{{
     110  git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
     111}}}
    102112 * Telling the various scripts to '''append the git branch name to every build'''.  This is especially useful so you don't clobber your previous branch's build when you switch branches
    103113{{{
    … …  
    108118  git config branch.$branchName.webKitBranchBuild (true|false)
    109119}}}
     120
     121'''The following are only needed if you don't use webkit-patch.'''
     122
    110123 * Using '''prepare-Changelog''' with git
    111124{{{
    … …  
    116129  WebKitTools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...]
    117130}}}
    118  * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs (assumes resolve-ChangeLogs is in your path)
    119 {{{
    120   git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
    121 }}}
    122 
    123131 * Using '''commit-log-editor''' with git will automatically insert the ChangeLog entry as your commit message (assuming {{{WebKitTools/Scripts}}} is in your path)
    124132{{{
    … …  
    129137  git config core.editor "commit-log-editor --regenerate-log"
    130138}}}
    131 
    132139 * If you do not manually generate a ChangeLog entry and you have staged changes in your working tree, '''commit-log-editor''' will automatically generate a commit message in the WebKit ChangeLog entry format when you do 'git commit'. You can control this behaviour with the git configuration option '''webkitGenerateCommitMessage''' on a global or per-branch basis.
    133140{{{
    … …  
    152159}}}
    153160
    154  * Important git config settings
    155 {{{
    156 git config --global user.name "Foo Bar"
    157 git config --global user.email "foo@webkit.org"
    158 }}}
    159 
    160161 * If you're using `git-send-bugzilla` or `webkit-patch` you may also want git to remember your bugzilla credentials:
    161162{{{