Changes between Version 83 and Version 84 of UsingGitWithWebKit

Timestamp:

Apr 27, 2012, 4:06:30 PM (13 years ago)

Author:

jamesr@google.com

Comment:

Change "path/to/resolve-ChangeLogs" to "Tools/Scripts/resolve-ChangeLogs" so people who blindly copy-paste (like me) have a chance of it working

UsingGitWithWebKit

@@ -136 +136 @@
  * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs if you use a rebase-based workflow
 {{{
-  git config merge.changelog.driver "perl path/to/resolve-ChangeLogs --merge-driver %O %A %B"
+  git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs --merge-driver %O %A %B"
 }}}
 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
 {{{
-  git config merge.changelog.driver "perl path/to/resolve-ChangeLogs --merge-driver %O %B %A"
+  git config merge.changelog.driver "perl Tools/Scripts/resolve-ChangeLogs --merge-driver %O %B %A"
 }}}
  * Teaching Git to produce better diffs of ObjC files