Changes between Version 57 and Version 58 of UsingGitWithWebKit


Ignore:
Timestamp:
Oct 27, 2010 2:00:19 PM (10 years ago)
Author:
Adam Roben
Comment:

Make some instructions msysgit-compatible

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitWithWebKit

    v57 v58  
    2828   * Use Git Bash only
    2929   * Checkout as-is, commit as-is
    30  * Choose ```Start > Programs > Git > Git Bash```
     30 * Choose `Start > Programs > Git > Git Bash`
    3131 * Create a file named .bashrc in your Git Bash home directory that contains the following:
    3232{{{
     
    133133of the specific things you can do with them:
    134134
    135  * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs (assumes resolve-ChangeLogs is in your path)
    136 {{{
    137   git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
     135 * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs
     136{{{
     137  git config merge.changelog.driver "perl path/to/resolve-ChangeLogs --merge-driver %O %A %B"
    138138}}}
    139139 * 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
     
    156156  WebKitTools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...]
    157157}}}
    158  * Using '''commit-log-editor''' with git will automatically insert the ChangeLog entry as your commit message (assuming {{{WebKitTools/Scripts}}} is in your path)
    159 {{{
    160   git config core.editor commit-log-editor
     158 * Using '''commit-log-editor''' with git will automatically insert the ChangeLog entry as your commit message
     159{{{
     160  git config core.editor "perl path/to/commit-log-editor"
    161161}}}
    162162  If you want to make sure log gets regenerated from ChangeLog entry each time you modify an already existing commit, use --regenerate-log:
    163163{{{
    164   git config core.editor "commit-log-editor --regenerate-log"
     164  git config core.editor "perl path/to/commit-log-editor --regenerate-log"
    165165}}}
    166166 * If you do not manually generate a ChangeLog entry and you have staged changes in your working tree, '''commit-log-editor''' will automatically generate a commit message in the WebKit ChangeLog entry format when you do 'git commit'. You can control this behaviour with the git configuration option '''webkitGenerateCommitMessage''' on a global or per-branch basis.