Re: [webkit-dev] changelog and patches

2010-02-23 Thread Tor Arne Vestbø
On 23/2/10 13:31 , Evan Martin wrote: Run WebKitTools/Scripts/resolve-ChangeLogs each time you rebase. Or run once: git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B" tor arne ___ webkit-dev mailing list webkit-dev@

Re: [webkit-dev] changelog and patches

2010-02-23 Thread Chris Jerdonek
On Tue, Feb 23, 2010 at 4:27 AM, arno wrote: > Hi, > I've recently submitted a few patches. > > My workflow is as follow: > I use git repository. > Once I've made my modifications, I run WebKitTools/Scripts/prepare-ChangeLog, > then I git-commit changeset in a private branch, then I export my patc

Re: [webkit-dev] changelog and patches

2010-02-23 Thread Evan Martin
Run WebKitTools/Scripts/resolve-ChangeLogs each time you rebase. PS: try "webkit-patch help --all-commands", from that same directory; in particular "webkit-patch post-commits" automates attaching your patch to a bug. On Tue, Feb 23, 2010 at 1:27 PM, arno wrote: > Hi, > I've recently submitted