Commit History about prusa3 HOT 6 CLOSED

Uhm, I put special effort for keeping history but it looks I failed. And yes, I used git mv.

from prusa3.

Hmm, that is odd, can you post the commands you used? I'd like to try and figure out what happened. Please also add what shell you were using if you did this from the command line.

from prusa3.

http://jasonkarns.com/blog/merge-two-git-repositories-into-one/

from prusa3.

Basically I had to migrate master/* to master/box_frame/* and jo-final/* to master/single_plate/*.

And yes, the basic idea of moving both branches to subdirectories and then merging didn't work :-)

from prusa3.

Also, I used Bash

from prusa3.

My mistake, github's interface was a bit deceiving at first glance, commit histories are gone on github, not when using gitk. Also, the blame function still works, even though the commit history isn't shown correctly. Another side effect of this is that the contributors list has been reset for the changed files.

Very odd, this might be a github bug. Closed.

from prusa3.