Changes between Version 57 and Version 58 of UsingGitWithWebKit

Timestamp:

Oct 27, 2010 2:00:19 PM (13 years ago)

Author:

Adam Roben

Comment:

Make some instructions msysgit-compatible

UsingGitWithWebKit

@@ -28 +28 @@
    * Use Git Bash only
    * Checkout as-is, commit as-is
- * Choose ```Start > Programs > Git > Git Bash```
+ * Choose `Start > Programs > Git > Git Bash`
  * Create a file named .bashrc in your Git Bash home directory that contains the following:
 {{{
@@ -133 +133 @@
 of the specific things you can do with them:
 
- * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs (assumes resolve-ChangeLogs is in your path)
-{{{
-  git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
+ * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs
+{{{
+  git config merge.changelog.driver "perl path/to/resolve-ChangeLogs --merge-driver %O %A %B"
 }}}
  * 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
@@ -156 +156 @@
   WebKitTools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...]
 }}}
- * Using '''commit-log-editor''' with git will automatically insert the ChangeLog entry as your commit message (assuming {{{WebKitTools/Scripts}}} is in your path)
-{{{
-  git config core.editor commit-log-editor
+ * Using '''commit-log-editor''' with git will automatically insert the ChangeLog entry as your commit message
+{{{
+  git config core.editor "perl path/to/commit-log-editor"
 }}}
   If you want to make sure log gets regenerated from ChangeLog entry each time you modify an already existing commit, use --regenerate-log:
 {{{
-  git config core.editor "commit-log-editor --regenerate-log"
+  git config core.editor "perl path/to/commit-log-editor --regenerate-log"
 }}}
  * 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.