From: Jacob Keller <jacob.keller@gmail.com>
To: "David J. Bakeman" <nakuru@comcast.net>
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: merge maintaining history
Date: Sat, 14 Jan 2017 22:24:00 -0800 [thread overview]
Message-ID: <CA+P7+xoF8E55-XDnQT-GN1=hEwwq4pOsz7--P-SCy29C7ST3Hg@mail.gmail.com> (raw)
In-Reply-To: <58798686.5050401@comcast.net>
On Fri, Jan 13, 2017 at 6:01 PM, David J. Bakeman <nakuru@comcast.net> wrote:
> History
>
> git cloned a remote repository and made many changes pushing them all to
> said repository over many months.
>
> The powers that be then required me to move project to new repository
> server did so by pushing local version to new remote saving all history!
>
> Now have to merge back to original repository(which has undergone many
> changes since I split off) but how do I do that without loosing the
> history of all the commits since the original move? Note I need to push
> changes to files that are already in existence. I found on the web a
> bunch of ways to insert a whole new directory structure into an existing
> repository but as I said I need to do it on top of existing files. Of
> course I can copy all the files from my local working repository to the
> cloned remote repository and commit any changes but I loose all the
> history that way.
>
> Thanks.
If I understand it.. you have two remotes now:
The "origin" remote, which was the original remote you started with.
You have now a "new" remote which you created and pushed to.
So you want to merge the "new" history into the original tree now, so
you checkout the original tree, then "git merge <new-remote>/<branch>"
and then fix up any conflicts, and then git commit to create a merge
commit that has the new history. Then you could push that to both
trees.
I would want a bit more information about your setup before providing
actual commands.
Thanks,
Jake
next prev parent reply other threads:[~2017-01-15 6:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-14 2:01 merge maintaining history David J. Bakeman
2017-01-15 6:24 ` Jacob Keller [this message]
2017-01-19 13:12 ` David J. Bakeman
2017-01-19 21:42 ` Junio C Hamano
2017-01-20 11:37 ` Jakub Narębski
2017-01-20 17:33 ` Junio C Hamano
2017-01-26 0:31 ` David J. Bakeman
2017-01-26 0:41 ` Jacob Keller
2017-01-19 21:58 ` Philip Oakley
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+P7+xoF8E55-XDnQT-GN1=hEwwq4pOsz7--P-SCy29C7ST3Hg@mail.gmail.com' \
--to=jacob.keller@gmail.com \
--cc=git@vger.kernel.org \
--cc=nakuru@comcast.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).