Changes between Version 37 and Version 38 of UsingGitWithWebKit


Ignore:
Timestamp:
Jan 22, 2010 8:59:17 PM (10 years ago)
Author:
Chris Jerdonek
Comment:

Added note about squashing commits, if necessary, before dcommit.

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitWithWebKit

    v37 v38  
    8080 2. Apply a patch, cherry-pick a commit, or even merge a branch if it has been reviewed
    8181 3. Run `git svn rebase` and fix any ChangeLog conflicts that might result
    82  4. And then when everything is ready: `git svn dcommit`.
     82 4. And then when everything is ready--
     83{{{
     84git svn dcommit
     85}}}
     86 Since "git svn dcommit" creates a revision in the subversion repository for each local commit, you may need to squash (i.e. combine) commits to ensure that your commit to the WebKit repository will create just one revision.  You can do this, for example, by using--
     87{{{
     88git rebase -i HEAD~n
     89}}}
     90 where n is the number of the number of commits you want to see in the interactive editor.
    8391
    8492== WebKit Script support for Git ==