Commit History

[KazW]

With the recent commits done by @alexrj, the commit history for individual files has been wiped out. This means that it's now impossible to see who made those changes prior to his commits using the blame function and it has to be done manually by looking through the history.

I'm not sure if anyone really cares about this, but it is something worth noting. The way to fix it would be to rollback the commits and redo commit 10b5774 using the 'git mv' command instead of doing the operation with the native OS commands.

[alranel]

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

[KazW]

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.

[alranel]

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

[alranel]

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 :-)

[alranel]

Also, I used Bash

[KazW]

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.