On Fri, 31 Mar 2006, David Ho wrote:
>
> I am working on a board port on a separate branch. The branch has
> accumulated several revision of changes to a driver I worked on. Now,
> someone has come along with a better fix so I want to help test his
> patch. To do that I have to revert my changes to that driver (several
> revisions back) before I can apply his patch.
>
> What would be a convenient way to do that with git?
Don't revert.
Just pick the point you want to start testing his patch at (with gitk, for
example, just cut-and-paste the sha1), and do
git checkout -b test-better-fix <sha1>
which creates a new branch ("test-better-fix") that starts at that point,
and checks it out.
Then, just apply the patch, and off you go. You now have _both_ his patch
and your own series in separate branches, so you can cherry-pick and do
other things (like do a "diff" between branches - which can sometimes be
useful too to verify that the two branches end up fixing all the same
problems).
Linus
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html