Guest User

Untitled

a guest
Nov 3rd, 2017
446
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.52 KB | None | 0 0
  1. git clone git@github.com:XXX/repo1.git repo1
  2. cd repo1
  3.  
  4. git remote add git@github.com:XXX/repo2.git repo2
  5.  
  6. git checkout -b repo1_work
  7. git branch remote/repo2/master repo2_work
  8.  
  9. git merge -Xtheirs --allow-unrelated-histories repo2_work
  10.  
  11. #!/bin/bash
  12.  
  13. rm -rf repo1 repo2
  14.  
  15. mkdir repo1
  16. ( cd repo1
  17. git init
  18. echo hoge > hoge
  19. git add hoge
  20. git commit -m "Initial"
  21. echo fuga >> hoge
  22. git add hoge
  23. git commit -m "Append fuga" )
  24.  
  25. git clone repo1 repo2
  26. ( cd repo2
  27. rm -rf .git
  28. git init
  29. git add -A
  30. git commit -m "Re-initialize"
  31. echo piyo >> hoge
  32. git add hoge
  33. git commit -m "Append piyo" )
  34.  
  35. repo1_end=$(
  36. cd repo1
  37. git rev-parse HEAD )
  38.  
  39. repo2_init=$(
  40. cd repo2
  41. git rev-list --max-parents=0 HEAD )
  42.  
  43. ( cd repo2
  44. git remote add repo1 ../repo1
  45. git fetch -p repo1 )
  46.  
  47. printf '%s %sn' $repo2_init $repo1_end >> repo2/.git/info/grafts
  48.  
  49. git_log_pretty() {
  50. git log --graph "$@"
  51. }
  52.  
  53. ( cd repo2
  54. git_log_pretty )
  55.  
  56. * commit 70539c2d1d284d7487d6de8e1fef4919a25308f2
  57. | Author: Yuki INOUE <my.mail@domain.com>
  58. | Date: Fri Nov 3 11:22:55 2017 +0000
  59. |
  60. | Append piyo
  61. |
  62. * commit b0a1ac7d9935e254c2344d45fb3dfaaba9cd108d
  63. | Author: Yuki INOUE <my.mail@domain.com>
  64. | Date: Fri Nov 3 11:22:55 2017 +0000
  65. |
  66. | Re-initialize
  67. |
  68. * commit ee8b813b9bb5d6fbef6b813fa3ac2cca73b5f993
  69. | Author: Yuki INOUE <my.mail@domain.com>
  70. | Date: Fri Nov 3 11:22:55 2017 +0000
  71. |
  72. | Append fuga
  73. |
  74. * commit 466a183f763c35db676b89e644d055cab1a6dec5
  75. Author: Yuki INOUE <my.mail@domain.com>
  76. Date: Fri Nov 3 11:22:55 2017 +0000
  77.  
  78. Initial
Add Comment
Please, Sign In to add comment