From: Alex Bennee <kernel-hacker@bennee.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Merging in commits from a non-common ancestors
Date: Tue, 21 Nov 2006 15:28:03 +0000 [thread overview]
Message-ID: <1164122884.28560.210.camel@okra.transitives.com> (raw)
Hi,
I've been experimenting with using git alongside our CVS to manage my
own development. In an ideal world I would have a full git tree with all
the baselines tagged in it so merging is painless. However for the time
being I have written a script to import a cvs tag into a git tree (that
ignores the CVS gubbins). However one of the things I want to achieve is
the ability to easily move hacks/patches from one tree to another.
The problem is that these tree's don't have common ancestor's in the git
tree as I haven't imported all our baselines. However the individual
commits should apply, I'm just not sure how to tell git to apply the
commits as patches rather than try and work out the full differences
between the two trees. Of course I'd like git to keep the commit
messages.
Am I missing something blindingly obvious?
--
Alex, homepage: http://www.bennee.com/~alex/
In seeking the unattainable, simplicity only gets in the way. --
Epigrams in Programming, ACM SIGPLAN Sept. 1982
next reply other threads:[~2006-11-21 15:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-21 15:28 Alex Bennee [this message]
2006-11-21 15:41 ` Merging in commits from a non-common ancestors Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1164122884.28560.210.camel@okra.transitives.com \
--to=kernel-hacker@bennee.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.