Changes between Version 40 and Version 41 of UsingGitWithWebKit


Ignore:
Timestamp:
Feb 18, 2010 7:54:28 AM (12 years ago)
Author:
vestbo@webkit.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitWithWebKit

    v40 v41  
    113113  WebKitTools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...]
    114114}}}
     115 * Telling Git to use resolve-ChangeLogs as a merge-driver for ChangeLogs (assumes resolve-ChangeLogs is in your path)
     116{{{
     117  git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
     118}}}
     119
    115120 * Using '''commit-log-editor''' with git will automatically insert the ChangeLog entry as your commit message (assuming {{{WebKitTools/Scripts}}} is in your path)
    116121{{{