I'm just in the process of converting to git, but this looks amazing! It would be really helpful for me if http://trac.webkit.org/wiki/UsingGitWithWebKit had a section that explains the flow for using webkit-patch with git.
On Mon, Apr 26, 2010 at 1:20 PM, Kenneth Christiansen < kenneth.christian...@openbossa.org> wrote: > Nice work Ojan, > > Will you make webkit-patch apply-attachment understand patches doing > renames/mv created with git format-patch? That would be really useful. > > Cheers, > Kenneth > > On Mon, Apr 26, 2010 at 2:55 PM, Ojan Vafai <o...@chromium.org> wrote: > > The behavior of git and webkit-patch changed with > > http://trac.webkit.org/changeset/58261. > > Many webkit-patch commands (e.g. upload and land) and check-webkit-style > now > > take --squash and --git-commit arguments. > > --git-commit: upload, commit, check-style, etc on the given git > commit(s). > > Commits can be specified as single commits (e.g. HEAD^) or mulitiple > > (e.g. HEAD~2..HEAD). check-webkit-style's sense of --git-commit is no > longer > > all patches since the commit and --git-since is removed. The equivalent > to > > the old check-webkit-style behavior is "--git-commit=HEAD~2.." instead of > > just using HEAD~2. > > --squash: Treat all changes in the local branch as a single patch (local > > commits + working copy changes). Doesn't actually modify your tree until > you > > land, at which point it squashes all local changes into a single local > > commit and then lands that. > > --no-squash: Treat all changes as separate. This is essentially just "git > > svn dcommit". Each local change is committed separately. > > If you leave out --squash and --no-squash, then something resembling the > old > > behavior is used. > > old-behavior: upload, diff, create-patch, etc. only considered > working-copy > > changes and land will commit working-copy changes and then commit each > local > > commit separately. > > new-behavior: is roughly like the above, except if there's only a single > > local commit and no working-copy changes, then the commands will work on > > that single local commit and otherwise raise an error. > > Eventually, I'd like to make --squash the default, but I want this to > bake > > and get some usage before flipping that switch. > > Finally, if you get sick of typing --squash or --no-squash, you can set > the > > webkit-patch.squash git config parameter to true/false. > > Ojan > > _______________________________________________ > > webkit-dev mailing list > > webkit-dev@lists.webkit.org > > http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev > > > > > > > > -- > Kenneth Rohde Christiansen > Technical Lead / Senior Software Engineer > Qt Labs Americas, Nokia Technology Institute, INdT > Phone +55 81 8895 6002 / E-mail kenneth.christiansen at openbossa.org > _______________________________________________ > webkit-dev mailing list > webkit-dev@lists.webkit.org > http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev >
_______________________________________________ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev