From: Andreas Schwab <schwab@linux-m68k.org>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: bill lam <cbill.lam@gmail.com>,
Johannes Sixt <j.sixt@viscovery.net>, git <git@vger.kernel.org>,
Christian Couder <christian.couder@gmail.com>
Subject: Re: combine git repo historically
Date: Sun, 11 Oct 2009 11:34:48 +0200 [thread overview]
Message-ID: <m2bpkes287.fsf@igel.home> (raw)
In-Reply-To: <200910110436.52653.chriscool@tuxfamily.org> (Christian Couder's message of "Sun, 11 Oct 2009 04:36:52 +0200")
Christian Couder <chriscool@tuxfamily.org> writes:
> You want N' to have the same content as N but to have M as parent. So you
> could do something like the following:
>
> (We suppose that commits A to M are in branch1 and that you are in the root
> directory of your repo2 working directory.)
>
> $ git checkout -b repo1-branch1 remote/repo1/branch1
> $ git checkout N -- .
> $ export GIT_AUTHOR_NAME=<author name of commit N>
> $ export GIT_AUTHOR_EMAIL=<author email of commit N>
> $ export GIT_AUTHOR_DATE=<date of commit N>
> $ git commit -a
Isn't that what git cherry-pick does?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
prev parent reply other threads:[~2009-10-11 9:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-09 1:22 combine git repo historically bill lam
2009-10-09 6:02 ` Johannes Sixt
2009-10-09 7:40 ` Christian Couder
2009-10-10 14:03 ` bill lam
2009-10-11 2:36 ` Christian Couder
2009-10-11 4:06 ` bill lam
2009-10-11 10:11 ` Christian Couder
2009-10-11 8:48 ` Jakub Narebski
2009-10-11 13:07 ` Johannes Sixt
2009-10-11 13:43 ` Christian Couder
2009-10-11 14:29 ` Jakub Narebski
2009-10-11 9:34 ` Andreas Schwab [this message]
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=m2bpkes287.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=cbill.lam@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/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).