Working historical blame and rebranding merge

git init
git fetch https://github.com/pdinc-oss/CipherShed.git
git fetch https://github.com/srguglielmo/CipherShed.git
git checkout -b rebranding 1ca13ed2271d60ba93d40bcc8db17ced8545f172
git checkout -b master-with-history d3c8039a50f9ec5a1278459df94d3ccc312050db

git cherry-pick -x HEAD..rebranding

git rm src/License.html
git cherry-pick --continue

mv 'CipherShed.sln' 'src/TrueCrypt.sln';
 git rm 'CipherShed.sln' 'TrueCrypt.sln';
 git add 'src/TrueCrypt.sln';
 git mv 'src/TrueCrypt.sln' 'src/CipherShed.sln'
git cherry-pick --continue

mv 'Common/CipherShed.ico' 'src/Common/TrueCrypt.ico';
 git rm 'Common/CipherShed.ico' 'Common/TrueCrypt.ico';
 git add 'src/Common/TrueCrypt.ico';
 git mv 'src/Common/TrueCrypt.ico' 'src/Common/CipherShed.ico'
mv 'Common/CipherShed_Volume.ico' 'src/Common/TrueCrypt_Volume.ico';
 git rm 'Common/CipherShed_Volume.ico' 'Common/TrueCrypt_Volume.ico';
 git add 'src/Common/TrueCrypt_Volume.ico';
 git mv 'src/Common/TrueCrypt_Volume.ico' 'src/Common/CipherShed_Volume.ico'
mv 'Format/CipherShed_Wizard.bmp' 'src/Format/TrueCrypt_Wizard.bmp';
 git rm 'Format/CipherShed_Wizard.bmp' 'Format/TrueCrypt_Wizard.bmp';
 git add 'src/Format/TrueCrypt_Wizard.bmp';
 git mv 'src/Format/TrueCrypt_Wizard.bmp' 'src/Format/CipherShed_Wizard.bmp'
mv 'Main/Forms/CipherShed.fbp' 'src/Main/Forms/TrueCrypt.fbp';
 git rm 'Main/Forms/CipherShed.fbp' 'Main/Forms/TrueCrypt.fbp';
 git add 'src/Main/Forms/TrueCrypt.fbp';
 git mv 'src/Main/Forms/TrueCrypt.fbp' 'src/Main/Forms/CipherShed.fbp'
mv 'Release/Setup Files/CipherShed User Guide.pdf' 'src/Release/Setup Files/TrueCrypt User Guide.pdf';
 git rm 'Release/Setup Files/CipherShed User Guide.pdf' 'Release/Setup Files/TrueCrypt User Guide.pdf';
 git add 'src/Release/Setup Files/TrueCrypt User Guide.pdf';
 git mv 'src/Release/Setup Files/TrueCrypt User Guide.pdf' 'src/Release/Setup Files/CipherShed User Guide.pdf'
mv 'Resources/Icons/CipherShed-16x16.xpm' 'src/Resources/Icons/TrueCrypt-16x16.xpm';
 git rm 'Resources/Icons/CipherShed-16x16.xpm' 'Resources/Icons/TrueCrypt-16x16.xpm';
 git add 'src/Resources/Icons/TrueCrypt-16x16.xpm';
 git mv 'src/Resources/Icons/TrueCrypt-16x16.xpm' 'src/Resources/Icons/CipherShed-16x16.xpm'
mv 'Resources/Icons/CipherShed-48x48.xpm' 'src/Resources/Icons/TrueCrypt-48x48.xpm';
 git rm 'Resources/Icons/CipherShed-48x48.xpm' 'Resources/Icons/TrueCrypt-48x48.xpm';
 git add 'src/Resources/Icons/TrueCrypt-48x48.xpm';
 git mv 'src/Resources/Icons/TrueCrypt-48x48.xpm' 'src/Resources/Icons/CipherShed-48x48.xpm'
mv 'Resources/Icons/CipherShed.icns' 'src/Resources/Icons/TrueCrypt.icns';
 git rm 'Resources/Icons/CipherShed.icns' 'Resources/Icons/TrueCrypt.icns';
 git add 'src/Resources/Icons/TrueCrypt.icns';
 git mv 'src/Resources/Icons/TrueCrypt.icns' 'src/Resources/Icons/CipherShed.icns'
mv 'Setup/CipherShed_setup.bmp' 'src/Setup/TrueCrypt_setup.bmp';
 git rm 'Setup/CipherShed_setup.bmp' 'Setup/TrueCrypt_setup.bmp';
 git add 'src/Setup/TrueCrypt_setup.bmp';
 git mv 'src/Setup/TrueCrypt_setup.bmp' 'src/Setup/CipherShed_setup.bmp'
mv 'Setup/CipherShed_setup_background.bmp' 'src/Setup/TrueCrypt_setup_background.bmp';
 git rm 'Setup/CipherShed_setup_background.bmp' 'Setup/TrueCrypt_setup_background.bmp';
 git add 'src/Setup/TrueCrypt_setup_background.bmp';
 git mv 'src/Setup/TrueCrypt_setup_background.bmp' 'src/Setup/CipherShed_setup_background.bmp'
git cherry-pick --continue

mv 'Common/CipherShed_mounted.ico' 'src/Common/TrueCrypt_mounted.ico';
 git rm 'Common/CipherShed_mounted.ico' 'Common/TrueCrypt_mounted.ico';
 git add 'src/Common/TrueCrypt_mounted.ico';
 git mv 'src/Common/TrueCrypt_mounted.ico' 'src/Common/CipherShed_mounted.ico'
git cherry-pick --continue


git merge $(echo 'Merge of 1ca13ed2271d60ba93d40bcc8db17ced8545f172 branch - rebranding' |\
    git commit-tree -p HEAD -p rebranding \
          $(git cat-file -p HEAD | grep ^tree | sed -e 's/^tree //') )

git commit --amend -S

git checkout rebranding

git merge master-with-history # fast forward....