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