在保留历史记录的同时恢复git目录

Question

I know that you can restore a previously removed directory as follows

git checkout {revision} -- {dir}

However, the history of all files in the restored directory is completely gone. They are all seen as 'new' files.

Is there a way to restore the directory while still preserving its files' history?

Answer 1

git tag originalHead # just in case
git rebase -i <id of the parent of the commit that deleted the file>
# change pick to edit for that commit
git checkout <id of the previous commit> <filename>
git commit --amend
git rebase --continue
git tag -d originalHead

I found this here