You can also use the git X..Y notation to avoid the squash (but you won't get any changes in the checkout or index, just the committed version). I do that quite frequently.
-- Dirk On Thu, Jan 27, 2011 at 2:16 PM, Jia Pu <[email protected]> wrote: > Thanks, Dirk. > I think the problem is me misunderstanding the meaning of -g option. What it > does is to generate diff between specified-commit and specified-commit^. I > thought it would do a diff between specified-commit and the current remote > branch that master is based on. > It seems what I need to do is to squash all the commits on my branch up to > the point where I branched off master. Then use -g option. > On Jan 27, 2011, at 1:55 PM, Dirk Pranke wrote: > > I think that webkit-patch -g can only refer to checked in versions, > and not the current checkout or staged build. It may also be the case > that webkit-patch has bugs related to finding files depending on what > your current working directory is; I would try running it from the > root dir (WebKit/) to be safe. > > -- Dirk > > On Thu, Jan 27, 2011 at 1:47 PM, Jia Pu <[email protected]> wrote: > > Hello, > > I'd like to run prepare-ChangeLog based on a particular commit on a branch. > > When I do a "git diff" on this branch and master, it shows modified files in > > both WebCore and LayoutTests directories. However, when I run > > prepare-ChangeLog with "--git-commit" option, the script only updates the > > ChangeLog in WebCore, but not the ChangeLog in LayoutTests. > > Did I miss something? What's the recommended workflow in this situation? > > Thanks > > jia > > _______________________________________________ > > webkit-dev mailing list > > [email protected] > > http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev > > > > _______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
