On Jun 23, 2007, at 11:04 PM, Alex Riesen wrote:
git-transplant.sh <onto> <from> <to>
transplant starts with the contents of <onto> and puts on top of
it the contents of files if they are touched by the series of
commits <from>..<to>. If a commit touches a file the content of
this file is taken as it is in the commit. No merging is
performed. Original authors, commiters, and commit messages are
preserved.
[...]
# detached head
git checkout $(git rev-parse onto) && git format-patch --stdout
--full-index from..to|git am -3
No. This one tries to apply the _changes_ between from..to. What I
need is the resulting _content_ of files modified between from..to.
The _changes_ are already wrong because they are relative to the
history. But the history was messed up by git-cvsimport, as I tried to
explaine in my first mail in this thread. So the changes derived
from the wrong history are useless.
transplant only checks if a file is modified by a commit. If it is
it takes the _content_ of the file in that commit. The changes from
the parent commit, which you can find by format-patch, do not matter.
I believe it's more like git-filter-branch, but I wasn't yet abel to
tell git-filter-branch how to do the job.
Steffen
-
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
