Re: merge maintaining history

2017-01-25 Thread Jacob Keller
On Wed, Jan 25, 2017 at 4:31 PM, David J. Bakeman wrote: > OK so what I've done so far is to clone the original then I added > another remote connected to new repo. Then I did git merge newrepo. It > did a bunch of stuff that flashed by really fast and then reported a >

Re: merge maintaining history

2017-01-25 Thread David J. Bakeman
On 01/20/2017 03:37 AM, Jakub Narębski wrote: > W dniu 19.01.2017 o 22:42, Junio C Hamano pisze: >> "David J. Bakeman" writes: > > [...] >>> Thanks I think that's close but it's a little more complicated I think >>> :<( I don't know if this diagram will work but lets try.

Re: merge maintaining history

2017-01-20 Thread Junio C Hamano
Jakub Narębski writes: > Then you would have the above history in repositories that fetched > refs/replace/*, and the one below if replacement info is absent: > >original A<-B<-C<-D<-E<-F<---M > \ / >first branch b<-c<-d<-e

Re: merge maintaining history

2017-01-20 Thread Jakub Narębski
W dniu 19.01.2017 o 22:42, Junio C Hamano pisze: > "David J. Bakeman" writes: [...] >> Thanks I think that's close but it's a little more complicated I think >> :<( I don't know if this diagram will work but lets try. >> >> original A->B->C->D->E->F >> \ >>

Re: merge maintaining history

2017-01-19 Thread Philip Oakley
From: "David J. Bakeman" On 01/14/2017 10:24 PM, Jacob Keller wrote: On Fri, Jan 13, 2017 at 6:01 PM, David J. Bakeman wrote: History git cloned a remote repository and made many changes pushing them all to said repository over many months. The

Re: merge maintaining history

2017-01-19 Thread Junio C Hamano
"David J. Bakeman" writes: >> So you want to merge the "new" history into the original tree now, so >> you checkout the original tree, then "git merge /" >> and then fix up any conflicts, and then git commit to create a merge >> commit that has the new history. Then you could

Re: merge maintaining history

2017-01-19 Thread David J. Bakeman
On 01/14/2017 10:24 PM, Jacob Keller wrote: > On Fri, Jan 13, 2017 at 6:01 PM, David J. Bakeman 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

Re: merge maintaining history

2017-01-14 Thread Jacob Keller
On Fri, Jan 13, 2017 at 6:01 PM, David J. Bakeman 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

merge maintaining history

2017-01-13 Thread David J. Bakeman
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