API tools faq
paste
View difference between Paste ID: TuqhYubH and 1R68v6jt
SHOW: | | - or go back to the newest paste.
1
git init
2
git fetch https://github.com/pdinc-oss/CipherShed.git
3
git fetch https://github.com/srguglielmo/CipherShed.git
4-
git checkout -b test b60070f4d0879e277f44d174a163bbb292325fea
4+
git checkout -b rebranding 1ca13ed2271d60ba93d40bcc8db17ced8545f172
5-
git merge 1ca13ed2271d60ba93d40bcc8db17ced8545f172
5+
git checkout -b master-with-history d3c8039a50f9ec5a1278459df94d3ccc312050db
6
7
git cherry-pick -x HEAD..rebranding

8
9-
mv 'CipherShed.sln' 'src/CipherShed.sln'

9+
10-
git rm 'CipherShed.sln'

10+
git cherry-pick --continue

11-
git rm 'TrueCrypt.sln'

11+
12-
git rm 'src/TrueCrypt.sln'

12+
mv 'CipherShed.sln' 'src/TrueCrypt.sln';

13-
git add 'src/CipherShed.sln'

13+
 git rm 'CipherShed.sln' 'TrueCrypt.sln'; 

14
 git add 'src/TrueCrypt.sln'; 

15-
mv 'Setup/CipherShed_setup_background.bmp' 'src/Setup/CipherShed_setup_background.bmp'

15+
 git mv 'src/TrueCrypt.sln' 'src/CipherShed.sln'

16-
git rm 'Setup/CipherShed_setup_background.bmp'

16+
git cherry-pick --continue

17-
git rm 'Setup/TrueCrypt_setup_background.bmp'

17+
18-
git rm 'src/Setup/TrueCrypt_setup_background.bmp'

18+
mv 'Common/CipherShed.ico' 'src/Common/TrueCrypt.ico';

19-
git add 'src/Setup/CipherShed_setup_background.bmp'

19+
 git rm 'Common/CipherShed.ico' 'Common/TrueCrypt.ico';

20
 git add 'src/Common/TrueCrypt.ico';

21-
mv 'Setup/CipherShed_setup.bmp' 'src/Setup/CipherShed_setup.bmp'

21+
 git mv 'src/Common/TrueCrypt.ico' 'src/Common/CipherShed.ico'

22-
git rm 'Setup/CipherShed_setup.bmp'

22+
mv 'Common/CipherShed_Volume.ico' 'src/Common/TrueCrypt_Volume.ico';

23-
git rm 'Setup/TrueCrypt_setup.bmp'

23+
 git rm 'Common/CipherShed_Volume.ico' 'Common/TrueCrypt_Volume.ico';

24-
git rm 'src/Setup/TrueCrypt_setup.bmp'

24+
 git add 'src/Common/TrueCrypt_Volume.ico';

25-
git add 'src/Setup/CipherShed_setup.bmp'

25+
 git mv 'src/Common/TrueCrypt_Volume.ico' 'src/Common/CipherShed_Volume.ico'

26
mv 'Format/CipherShed_Wizard.bmp' 'src/Format/TrueCrypt_Wizard.bmp';

27-
mv 'Resources/Icons/CipherShed.icns' 'src/Resources/Icons/CipherShed.icns'

27+
 git rm 'Format/CipherShed_Wizard.bmp' 'Format/TrueCrypt_Wizard.bmp';

28-
git rm 'Resources/Icons/CipherShed.icns'

28+
 git add 'src/Format/TrueCrypt_Wizard.bmp';

29-
git rm 'Resources/Icons/TrueCrypt.icns'

29+
 git mv 'src/Format/TrueCrypt_Wizard.bmp' 'src/Format/CipherShed_Wizard.bmp'

30-
git rm 'src/Resources/Icons/TrueCrypt.icns'

30+
mv 'Main/Forms/CipherShed.fbp' 'src/Main/Forms/TrueCrypt.fbp';

31-
git add 'src/Resources/Icons/CipherShed.icns'

31+
 git rm 'Main/Forms/CipherShed.fbp' 'Main/Forms/TrueCrypt.fbp';

32
 git add 'src/Main/Forms/TrueCrypt.fbp';

33-
mv 'Resources/Icons/CipherShed-48x48.xpm' 'src/Resources/Icons/CipherShed-48x48.xpm'

33+
 git mv 'src/Main/Forms/TrueCrypt.fbp' 'src/Main/Forms/CipherShed.fbp'

34-
git rm 'Resources/Icons/CipherShed-48x48.xpm'

34+
mv 'Release/Setup Files/CipherShed User Guide.pdf' 'src/Release/Setup Files/TrueCrypt User Guide.pdf';

35-
git rm 'Resources/Icons/TrueCrypt-48x48.xpm'

35+
 git rm 'Release/Setup Files/CipherShed User Guide.pdf' 'Release/Setup Files/TrueCrypt User Guide.pdf';

36-
git rm 'src/Resources/Icons/TrueCrypt-48x48.xpm'

36+
 git add 'src/Release/Setup Files/TrueCrypt User Guide.pdf';

37-
git add 'src/Resources/Icons/CipherShed-48x48.xpm'

37+
 git mv 'src/Release/Setup Files/TrueCrypt User Guide.pdf' 'src/Release/Setup Files/CipherShed User Guide.pdf'

38
mv 'Resources/Icons/CipherShed-16x16.xpm' 'src/Resources/Icons/TrueCrypt-16x16.xpm';

39-
mv 'Resources/Icons/CipherShed-16x16.xpm' 'src/Resources/Icons/CipherShed-16x16.xpm'

39+
 git rm 'Resources/Icons/CipherShed-16x16.xpm' 'Resources/Icons/TrueCrypt-16x16.xpm';

40-
git rm 'Resources/Icons/CipherShed-16x16.xpm'

40+
 git add 'src/Resources/Icons/TrueCrypt-16x16.xpm';

41-
git rm 'Resources/Icons/TrueCrypt-16x16.xpm'

41+
 git mv 'src/Resources/Icons/TrueCrypt-16x16.xpm' 'src/Resources/Icons/CipherShed-16x16.xpm'

42-
git rm 'src/Resources/Icons/TrueCrypt-16x16.xpm'

42+
mv 'Resources/Icons/CipherShed-48x48.xpm' 'src/Resources/Icons/TrueCrypt-48x48.xpm';

43-
git add 'src/Resources/Icons/CipherShed-16x16.xpm'

43+
 git rm 'Resources/Icons/CipherShed-48x48.xpm' 'Resources/Icons/TrueCrypt-48x48.xpm';

44
 git add 'src/Resources/Icons/TrueCrypt-48x48.xpm';

45-
mv 'Release/Setup Files/CipherShed User Guide.pdf' 'src/Release/Setup Files/CipherShed User Guide.pdf'

45+
 git mv 'src/Resources/Icons/TrueCrypt-48x48.xpm' 'src/Resources/Icons/CipherShed-48x48.xpm'

46-
git rm 'Release/Setup Files/CipherShed User Guide.pdf'

46+
mv 'Resources/Icons/CipherShed.icns' 'src/Resources/Icons/TrueCrypt.icns';

47-
git rm 'Release/Setup Files/TrueCrypt User Guide.pdf'

47+
 git rm 'Resources/Icons/CipherShed.icns' 'Resources/Icons/TrueCrypt.icns';

48-
git rm 'src/Release/Setup Files/TrueCrypt User Guide.pdf'

48+
 git add 'src/Resources/Icons/TrueCrypt.icns';

49-
git add 'src/Release/Setup Files/CipherShed User Guide.pdf'

49+
 git mv 'src/Resources/Icons/TrueCrypt.icns' 'src/Resources/Icons/CipherShed.icns'

50
mv 'Setup/CipherShed_setup.bmp' 'src/Setup/TrueCrypt_setup.bmp';

51-
mv 'Main/Forms/CipherShed.fbp' 'src/Main/Forms/CipherShed.fbp'

51+
 git rm 'Setup/CipherShed_setup.bmp' 'Setup/TrueCrypt_setup.bmp';

52-
git rm 'Main/Forms/CipherShed.fbp'

52+
 git add 'src/Setup/TrueCrypt_setup.bmp';

53-
git rm 'Main/Forms/TrueCrypt.fbp'

53+
 git mv 'src/Setup/TrueCrypt_setup.bmp' 'src/Setup/CipherShed_setup.bmp'

54-
git rm 'src/Main/Forms/TrueCrypt.fbp'

54+
mv 'Setup/CipherShed_setup_background.bmp' 'src/Setup/TrueCrypt_setup_background.bmp';

55-
git add 'src/Main/Forms/CipherShed.fbp'

55+
 git rm 'Setup/CipherShed_setup_background.bmp' 'Setup/TrueCrypt_setup_background.bmp';

56
 git add 'src/Setup/TrueCrypt_setup_background.bmp';

57-
mv 'Format/CipherShed_Wizard.bmp' 'src/Format/CipherShed_Wizard.bmp'

57+
 git mv 'src/Setup/TrueCrypt_setup_background.bmp' 'src/Setup/CipherShed_setup_background.bmp'

58-
git rm 'Format/CipherShed_Wizard.bmp'

58+
git cherry-pick --continue

59-
git rm 'Format/TrueCrypt_Wizard.bmp'

59+
60-
git rm 'src/Format/TrueCrypt_Wizard.bmp'

60+
mv 'Common/CipherShed_mounted.ico' 'src/Common/TrueCrypt_mounted.ico'; 

61-
git add 'src/Format/CipherShed_Wizard.bmp'

61+
 git rm 'Common/CipherShed_mounted.ico' 'Common/TrueCrypt_mounted.ico'; 

62
 git add 'src/Common/TrueCrypt_mounted.ico'; 

63-
mv 'Common/CipherShed_mounted.ico' 'src/Common/CipherShed_mounted.ico'

63+
 git mv 'src/Common/TrueCrypt_mounted.ico' 'src/Common/CipherShed_mounted.ico'

64-
git rm 'Common/CipherShed_mounted.ico'

64+
git cherry-pick --continue

65-
git rm 'Common/TrueCrypt_mounted.ico'

65+
66-
git rm 'src/Common/TrueCrypt_mounted.ico'

66+
67-
git add 'src/Common/CipherShed_mounted.ico'

67+
git merge $(echo 'Merge of 1ca13ed2271d60ba93d40bcc8db17ced8545f172 branch - rebranding' |\

68
    git commit-tree -p HEAD -p rebranding \

69-
mv 'Common/CipherShed_Volume.ico' 'src/Common/CipherShed_Volume.ico'

69+
          $(git cat-file -p HEAD | grep ^tree | sed -e 's/^tree //') )

70-
git rm 'Common/CipherShed_Volume.ico'

70+
71-
git rm 'Common/TrueCrypt_Volume.ico'

71+
git commit --amend -S

72-
git rm 'src/Common/TrueCrypt_Volume.ico'

72+
73-
git add 'src/Common/CipherShed_Volume.ico'

73+
git checkout rebranding

74
75-
mv 'Common/CipherShed.ico' 'src/Common/CipherShed.ico'

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

    


            


                                


        

            



                
    

        Public Pastes
    

    
            

    

                    

        

    





    


    
    
    
    
    
    
    
    




    


    



                

            We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.             OK, I Understand
        

    
                

            

                
                    
                
            

            

                Not a member of Pastebin yet?

                Sign Up, it unlocks many cool features!