[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: help, now what?
From: |
Catalin Marinas |
Subject: |
[Gnu-arch-users] Re: help, now what? |
Date: |
Mon, 19 Sep 2005 11:10:22 +0100 |
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) |
Martin Langhoff <address@hidden> 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