Hi,
I've had a bit of a brain melt and have done something silly with git
fast-import and was hoping someone would be able to get me out of the
mess I've created.
Basically I've got a linux repository which for various reasons isn't
based of any of the kernel.org ones but reflects our kernel
development on top of vanilla kernel tarballs. When we update we take
the tarball and extract and commit it to a vendor branch then merge
that with our main. A little strange but it works for us (despite
having to go hunting on kernel.org when we want the external history).
My brain melt came when I wanted to get the set of changes between 2
versions from a public branch and import them into our repository.
Having just learned about git fast-export I decided that it was the
right tool for the job so I did the following
(cd linux-2.6.32.y; git fast-export v2.6.32.12..v2.6.32.14) | git fast-import
What I've ended up with is a repository with a detached set of changes i.e
o -o l - l - l - l - l - l o - master
\ /
o - o - o - o - o - o
o = our commits
l = linux commits
Because the code is common textually I think what I really should have done is
(cd linux-2.6.32.y; git format-patch v2.6.32.12..v2.6.32.14) | git am
Which I'll give a try in a minute. In the meantime is there anyway for
me to safely remove the upstream linux commits without loosing our
commits in the process?
Thanks,
Chris
--
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