Advertisement
Guest User

Untitled

a guest
Jun 17th, 2019
75
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.63 KB | None | 0 0
  1. $ git log --oneline --graph
  2. * 7e26890 (HEAD -> master) Merge branch 'testbranch'
  3. |
  4. | * 56ef109 (testbranch) change 5 made
  5. | * 1a78db3 change 4 made
  6. | * d98b4cf change 3 made
  7. | * e5e49af change 2 made
  8. | * 8704c24 change 1 made
  9. |/
  10. * f318d97 added a.txt
  11. * 252bf7f Initial commit
  12.  
  13. $ git log --oneline --graph
  14. * XXXYYGG (HEAD -> master) Merge branch 'testbranch'
  15. |
  16. | * XXXYYFF (testbranch) change 5 made
  17. | * XXXYYEE change 4 made
  18. | * XXXYYDD change 3 made
  19. | * XXXYYCC change 2 made
  20. | * XXXYYBB change 1 made
  21. |/
  22. * XXXYYAA added a.txt
  23. * 8e99c2d Initial commit by Bob
  24.  
  25. #!/usr/bin/env bash
  26.  
  27. rm -rf oldrepo_git newrepo_git
  28. mkdir oldrepo_git newrepo_git
  29.  
  30. cd oldrepo_git
  31. git init
  32. git config user.name tester
  33. git config user.email tester@example.com
  34. echo "# README" >> README
  35. git add README
  36. GIT_COMMITTER_DATE="1558960260" git commit --date "1558960260" -m "Initial commit"
  37. echo "Testing" >> a.txt
  38. git add a.txt
  39. GIT_COMMITTER_DATE="1558960270" git commit --date "1558960270" -m "added a.txt"
  40. git checkout -b testbranch
  41. mkdir aa bb
  42. for ix in 1 2 3 4 5; do
  43. echo $ix >> a.txt
  44. echo $ix >> b.txt
  45. echo $ix >> aa/aa.txt
  46. echo $ix >> aa/ab.txt
  47. git add .
  48. newts="$((1558960270+ix*10))"
  49. GIT_COMMITTER_DATE="$newts" git commit --date "$newts" -m "change $ix made"
  50. done
  51. git checkout master
  52. ix="$((ix+1))"; newts="$((1558960270+ix*10))"
  53. GIT_COMMITTER_DATE="$newts" GIT_AUTHOR_DATE="$newts" git merge --no-ff --no-edit testbranch
  54.  
  55. cd ../newrepo_git
  56. git init
  57. git config user.name bob
  58. git config user.email bob@example.com
  59. echo "# Bob's README" >> README
  60. git add README
  61. GIT_COMMITTER_DATE="1558960260" git commit --date "1558960260" -m "Initial commit by Bob"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement