Changes between Version 42 and Version 43 of UsingGitWithWebKit


Ignore:
Timestamp:
Mar 1, 2010 11:01:32 AM (10 years ago)
Author:
robert@webkit.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitWithWebKit

    v42 v43  
    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--
     82 4. Ensure the git log entry for your local commit contains an accurate copy of all the Changelog entries for your commit.
     83 5. And then when everything is ready--
    8384{{{
    8485git svn dcommit
     
    9091 where n is the number of commits you want to see in the interactive editor. You can use `git commit -a --amend` for example to amend an existing local commit and avoid creating additional commits that you may need to squash later on.
    9192
    92  Also note that "git svn dcommit" does not use the "commit-log-editor" setting to create a commit message to store in the remote Subversion repository.  Rather, it simply uses the commit message already associated to the local commit. This is somewhat different from committing with Subversion, where "svn commit" does intervene with "commit-log-editor" to create a commit message for the remote repository.
     93 As you may have guessed from step 4 above, "git svn dcommit" does not use the "commit-log-editor" setting to create a commit message to store in the remote Subversion repository.  Instead it simply uses the commit message already associated to the local commit, so you need to ensure that it is an accurate copy of all your commit's Changelog entries. This is somewhat different from committing with Subversion, where "svn commit" does intervene with "commit-log-editor" to create a commit message for the remote repository.
    9394
    9495== WebKit Script support for Git ==