Changes between Version 88 and Version 89 of UsingGitWithWebKit
- Timestamp:
- Sep 7, 2012, 1:40:14 PM (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
UsingGitWithWebKit
v88 v89 136 136 * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs if you use a rebase-based workflow 137 137 {{{ 138 git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs -- merge-driver %O %A %B"138 git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %A %B" 139 139 }}} 140 140 If you have a merge-based workflow, use this instead or your ChangeLog entries will merge to the middle of the file instead of the beginning 141 141 {{{ 142 git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs -- merge-driver %O %B %A"142 git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %B %A" 143 143 }}} 144 144 * Teaching Git to produce better diffs of ObjC files