Changes between Version 9 and Version 10 of UsingGitWithWebKit


Ignore:
Timestamp:
12/13/07 18:40:55 (5 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • UsingGitWithWebKit

    v9 v10  
    3939 * Using '''prepare-Changelog''' with git 
    4040{{{ 
    41   WebKitTools/Scripts/prepare-Changelog --git-commit=$committish --git-reviewer="Foo Reviewer" 
     41  WebKitTools/Scripts/prepare-ChangeLog --git-commit=$committish --git-reviewer="Foo Reviewer" 
    4242}}} 
    43  * Using '''resolve-ChangeLog''' with git 
     43 * Using '''resolve-ChangeLog''' with git.  Assuming you got a conflict merging a ChangeLog file, this tool will reapply the patch using {{{patch --fuzz=3}}} so that your change lands at the top of the ChangeLog file.  If the patch was successfully applied, {{{git-add}}} is run on the ChangeLog file.  Note that this tool does not change the date of the ChangeLog entry (unlike {{{svn-apply}}}). 
    4444{{{ 
    45   PLEASE FILL ME IN 
     45  WebKitTools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...] 
    4646}}} 
    4747 * Using '''commit-log-editor''' with git