From: "David J. Bakeman" <nakuru@comcast.net>
To: git@vger.kernel.org
Subject: merge maintaining history
Date: Fri, 13 Jan 2017 18:01:42 -0800 [thread overview]
Message-ID: <58798686.5050401@comcast.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
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.
[-- Attachment #2: nakuru.vcf --]
[-- Type: text/x-vcard, Size: 248 bytes --]
begin:vcard
fn:David J. Bakeman
n:Bakeman;David J.
org:Nakuru Software Inc.
adr:;;1504 North 57th Street;Seattle;WA;98103;USA
email;internet:nakuru@comcast.net
tel;work:(206)545-0609
tel;fax:(206)600-6957
x-mozilla-html:TRUE
version:2.1
end:vcard
next reply other threads:[~2017-01-14 2:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-14 2:01 David J. Bakeman [this message]
2017-01-15 6:24 ` merge maintaining history Jacob Keller
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=58798686.5050401@comcast.net \
--to=nakuru@comcast.net \
--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.
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).