Guest User

History after merge is not what I expected.

a guest
Jul 6th, 2020
21
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.57 KB | None | 0 0
  1. #####################################################################
  2. ## The following represents the history prior to the no-ff merge.. ##
  3. #####################################################################
  4.  
  5. me@mine:~/the/repo
  6. commit 641340eaa15bb25d52cbbb9efb12d19eeb7c848a (master)
  7. Author: me
  8. Date: Mon Jul 6 16:46:22 2020 -0700
  9.  
  10. m2
  11.  
  12. commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
  13. Author: me
  14. Date: Mon Jul 6 16:43:31 2020 -0700
  15.  
  16. m1
  17.  
  18. commit ac6624ac1578d8741b86de4fd9d458c40dabca91
  19. Author: me
  20. Date: Mon Jul 6 16:43:12 2020 -0700
  21.  
  22. m0
  23.  
  24. commit e7dd7512e73426877f267bdf60a58ffdb0008f99
  25. Author: me
  26. Date: Mon Jul 6 16:42:06 2020 -0700
  27.  
  28. Initializing empty repository.
  29. me@mine:~/the/repo
  30. commit a91e5ecd37a115329a67fd68ab49c607f2d85736 (HEAD -> feature)
  31. Author: me
  32. Date: Mon Jul 6 16:47:09 2020 -0700
  33.  
  34. f2
  35.  
  36. commit 47f2cfb994e7608c385ae381716bff6fa9b7a71a
  37. Author: me
  38. Date: Mon Jul 6 16:45:18 2020 -0700
  39.  
  40. f1
  41.  
  42. commit 49ebe1674168a9ae4e68980490eb264e017c1741
  43. Author: me
  44. Date: Mon Jul 6 16:44:53 2020 -0700
  45.  
  46. f0
  47.  
  48. commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
  49. Author: me
  50. Date: Mon Jul 6 16:43:31 2020 -0700
  51.  
  52. m1
  53.  
  54. commit ac6624ac1578d8741b86de4fd9d458c40dabca91
  55. Author: me
  56. Date: Mon Jul 6 16:43:12 2020 -0700
  57.  
  58. m0
  59.  
  60. commit e7dd7512e73426877f267bdf60a58ffdb0008f99
  61. Author: me
  62. Date: Mon Jul 6 16:42:06 2020 -0700
  63.  
  64. Initializing empty repository.
  65. me@mine:~/the/repo
  66.  
  67. #####################################################################
  68. ## The following shows the merge and the history after the merge.. ##
  69. #####################################################################
  70.  
  71. me@mine:~/the/repo
  72. Switched to branch 'master'
  73. me@mine:~/the/repo
  74. Merge made by the 'recursive' strategy.
  75. f | 3 +++
  76. 1 file changed, 3 insertions(+)
  77. create mode 100644 f
  78. me@mine:~/the/repo
  79. commit a40a4dbe589c55ab0efbdcd52cc05a9eb59582c0 (HEAD -> master)
  80. Merge: 641340e a91e5ec
  81. Author: me
  82. Date: Mon Jul 6 16:51:31 2020 -0700
  83.  
  84. Merge branch 'feature' with --no-ff merge.
  85.  
  86. commit a91e5ecd37a115329a67fd68ab49c607f2d85736 (feature)
  87. Author: me
  88. Date: Mon Jul 6 16:47:09 2020 -0700
  89.  
  90. f2
  91.  
  92. commit 641340eaa15bb25d52cbbb9efb12d19eeb7c848a
  93. Author: me
  94. Date: Mon Jul 6 16:46:22 2020 -0700
  95.  
  96. m2
  97.  
  98. commit 47f2cfb994e7608c385ae381716bff6fa9b7a71a
  99. Author: me
  100. Date: Mon Jul 6 16:45:18 2020 -0700
  101.  
  102. f1
  103.  
  104. commit 49ebe1674168a9ae4e68980490eb264e017c1741
  105. Author: me
  106. Date: Mon Jul 6 16:44:53 2020 -0700
  107.  
  108. f0
  109.  
  110. commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
  111. Author: me
  112. Date: Mon Jul 6 16:43:31 2020 -0700
  113.  
  114. m1
  115.  
  116. commit ac6624ac1578d8741b86de4fd9d458c40dabca91
  117. Author: me
  118. Date: Mon Jul 6 16:43:12 2020 -0700
  119.  
  120. m0
  121.  
  122. commit e7dd7512e73426877f267bdf60a58ffdb0008f99
  123. Author: me
  124. Date: Mon Jul 6 16:42:06 2020 -0700
  125.  
  126. Initializing empty repository.
  127. me@mine:~/the/repo
  128. commit a91e5ecd37a115329a67fd68ab49c607f2d85736 (feature)
  129. Author: me
  130. Date: Mon Jul 6 16:47:09 2020 -0700
  131.  
  132. f2
  133.  
  134. commit 47f2cfb994e7608c385ae381716bff6fa9b7a71a
  135. Author: me
  136. Date: Mon Jul 6 16:45:18 2020 -0700
  137.  
  138. f1
  139.  
  140. commit 49ebe1674168a9ae4e68980490eb264e017c1741
  141. Author: me
  142. Date: Mon Jul 6 16:44:53 2020 -0700
  143.  
  144. f0
  145.  
  146. commit 3a01fc419ab301cd044ce1953f1510dfb655f38c
  147. Author: me
  148. Date: Mon Jul 6 16:43:31 2020 -0700
  149.  
  150. m1
  151.  
  152. commit ac6624ac1578d8741b86de4fd9d458c40dabca91
  153. Author: me
  154. Date: Mon Jul 6 16:43:12 2020 -0700
  155.  
  156. m0
  157.  
  158. commit e7dd7512e73426877f267bdf60a58ffdb0008f99
  159. Author: me
  160. Date: Mon Jul 6 16:42:06 2020 -0700
  161.  
  162. Initializing empty repository.
  163. me@mine:~/the/repo
Add Comment
Please, Sign In to add comment