Changes between Version 62 and Version 63 of UsingGitWithWebKit
- Timestamp:
- Dec 17, 2010, 5:43:41 PM (14 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
UsingGitWithWebKit
v62 v63 130 130 WARNING: webkit-patch land will hang the first time you call it. It's (silently) blocked on prompting for your svn credentials. You'll need to use "git svn dcommit" for your first commit. 131 131 132 The various scripts in ` WebKitTools/Scripts` have been made to work pretty well with Git. Here are some132 The various scripts in `Tools/Scripts` have been made to work pretty well with Git. Here are some 133 133 of the specific things you can do with them: 134 134 … … 150 150 * Using '''prepare-Changelog''' with git 151 151 {{{ 152 WebKitTools/Scripts/prepare-ChangeLog --git-commit=$committish --git-reviewer="Foo Reviewer"152 Tools/Scripts/prepare-ChangeLog --git-commit=$committish --git-reviewer="Foo Reviewer" 153 153 }}} 154 154 * 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}}}). 155 155 {{{ 156 WebKitTools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...]156 Tools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...] 157 157 }}} 158 158 * Using '''commit-log-editor''' with git will automatically insert the ChangeLog entry as your commit message