Thread (20 messages) flat view 20 messages, 4 authors, 2016-06-15

Re: [PATCH] transplant: move a series of commits to a different parent

From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:18

Steffen Prohaska, Sun, Jun 24, 2007 09:08:16 +0200:
On Jun 23, 2007, at 11:04 PM, Alex Riesen wrote:
quoted
quoted
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.
Ach, yes. I should have read your message a bit more closely. There is
a term for that "contents of files", BTW: "repository state".
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.
I suspect git-filter-branch can be both.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help