From: Stephen & Linda Smith <ischis2@cox.net>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: merging commit history
Date: Thu, 11 Jul 2013 16:43:56 -0700 [thread overview]
Message-ID: <3186432.VaN86YJOtL@thunderbird> (raw)
I'm working on a project that used to use a proprietary CM system (aka oldCM). At a point in time, the state of the code was frozen and used as the basis for commits in SVN.
What I would like to to do is take the individal commits from the oldCM and place them into git knowing that the time/date stamps won't match. Then I want to do whatever is necessary to
setup git so that I can run "svn rebase" to pull in the commits from the SVN repository.
What is the easy way to do this?
next reply other threads:[~2013-07-11 23:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-11 23:43 Stephen & Linda Smith [this message]
2013-07-12 0:11 ` merging commit history Andrew Ardill
2013-07-17 1:08 ` Stephen & Linda Smith
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=3186432.VaN86YJOtL@thunderbird \
--to=ischis2@cox.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).