[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: How can I use git to help me merge a patch with the new directory st
From: |
Johannes Schindelin |
Subject: |
Re: How can I use git to help me merge a patch with the new directory structure |
Date: |
Sun, 26 Jul 2009 19:35:07 +0200 (CEST) |
User-agent: |
Alpine 1.00 (DEB 882 2007-12-20) |
Hi,
On Sat, 25 Jul 2009, Carl Sorensen wrote:
> As you're aware, I've been working on a patch for autobeaming.
>
> It affects c++, scheme, and documentation files.
>
> Now I want to apply the patch to master. But the problem is that all of
> the documentation files have moved to Documentation/ISOLANG/notation
> instead of Documentation/ISOLANG/user
>
> So this seems to break any means of making my patch apply.
>
> Any git gurus out there who have an idea of how I can do this without
> having to manually apply patches made between the files in the different
> directories?
You should be ablt to use "git cherry-pick <commit>" on the branch you
want to port this commit to. This will perform a rename-aware 3-way
merge.
Ciao,
Dscho