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

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

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 rep