Move files with commit history from one repo to the other https://stackoverflow.com/a/11426261/2236179
git log --pretty=email --patch-with-stat --reverse -- path/to/file_or_folder | (cd /path/to/new_repository && git am --committer-date-is-author-date)
.gitignore does not ignore file changes used « git update-index --assume-unchanged » instead (can be cancelled by « git update-index --no-assume-unchanged »)