Changes between Version 67 and Version 68 of UsingGitWithWebKit


Ignore:
Timestamp:
Jul 27, 2011, 2:02:30 PM (13 years ago)
Author:
Adam Roben
Comment:

Added some git config commands to produce better ObjC diffs

Legend:

Unmodified
Added
Removed
Modified

  • UsingGitWithWebKit

    v67 v68  
    141141  git config merge.changelog.driver "perl path/to/resolve-ChangeLogs --merge-driver %O %A %B"
    142142}}}
     143 * Teaching Git to produce better diffs of ObjC files
     144{{{
     145git config diff.objcpp.xfuncname "^[-+@a-zA-Z_].*$"
     146git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"
     147}}}
    143148 * Telling the various scripts to '''append the git branch name to every build'''.  This is especially useful so you don't clobber your previous branch's build when you switch branches
    144149{{{