On 22/03/2008, Jean-Baptiste Quenot <jbq@xxxxxxxxxxx> wrote: > What about using a hidden ".gitcherry" file in the current branch to > store the commits that have been applied? With the simple shell > scripts below I'm able to achieve the same effect as svnmerge: (.gitcherry should really be at the root of the git repository, not in the current directory) What happens to .gitcherry across merges ? I think your solution isn't robust enough. Here's an alternate idea: store the original sha1 in the commit message, via a custom header (something like X-Cherry-Picked-From) at least in case of conflict, and have git-cherry recognize it. (I have the same problem as you, by the way, and would really like to see it solved one way or another.) -- To unsubscribe from this list: 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
