Changes between Version 75 and Version 76 of UsingGitWithWebKit
- Timestamp:
- Jan 3, 2012 2:54:34 PM (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
UsingGitWithWebKit
v75 v76 129 129 of the specific things you can do with them: 130 130 131 * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs 131 * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs if you use a rebase-based workflow 132 132 {{{ 133 133 git config merge.changelog.driver "perl path/to/resolve-ChangeLogs --merge-driver %O %A %B" 134 }}} 135 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 136 {{{ 137 git config merge.changelog.driver "perl path/to/resolve-ChangeLogs --merge-driver %O %B %A" 134 138 }}} 135 139 * Teaching Git to produce better diffs of ObjC files