Martin Langhoff <[EMAIL PROTECTED]> wrote: > There _is_ a way to cherry picking in git, and though it sounds a bit > weird, it works remarkably well. When you want to merge the branches > "fully", just use the git merge tools. When you want to pick patches, > use > > git-format-patch --mbox -o tempdir destbranch srcbranch
There is another way with the latest StGIT snapshot. The import command now support a --commit option which allows one to import a given commit object as an StGIT patch. It does proper three-way merging, not just applying a diff. If the commit object is in a separate repository, you would need to use 'git fetch ...' first. -- Catalin _______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
