Advertisement
Guest User

Untitled

a guest
Jan 17th, 2017
72
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.51 KB | None | 0 0
  1. $ git checkout branchX
  2. $ git rebase --onto master master@{1}
  3.  
  4. $ limit=$(git rev-list --topo-order --cherry master...branchX |
  5. sed -n -e 's/=//p' | head -1)
  6. $ echo $limit # if this is empty, there's no equivalent commit and you are SOL
  7. $ git checkout branchX # same as before
  8. $ git rebase --onto master $limit
  9.  
  10. A--B--C--D--E <-- master
  11.  
  12. F--G <-- branchX
  13.  
  14. D'-E' <-- master
  15. /
  16. A--B--C--D--E [master was this before the copies]
  17.  
  18. F--G <-- branchX
  19.  
  20. A..B = (reachable(A) | reachable(B)) - (reachable(A) & reachable(B))
  21.  
  22. D'-E' <-- master
  23. /
  24. A--B--C--D--E--F--G <-- branchX
  25.  
  26. $ git rev-list --cherry-mark master...two
  27. =dcbcb2774954437ef0906c6770c7deb924d9286e
  28. +0af7c6a3cf5e49928de132c341c848be80ab84c7
  29. =643b37ef242fdc35dfdd4551b42393af3eb91a85
  30.  
  31. $ git rev-list --left-right master...two
  32. >dcbcb2774954437ef0906c6770c7deb924d9286e
  33. <0af7c6a3cf5e49928de132c341c848be80ab84c7
  34. <643b37ef242fdc35dfdd4551b42393af3eb91a85
  35.  
  36. $ git rev-list --left-only --cherry-mark master...two
  37. +0af7c6a3cf5e49928de132c341c848be80ab84c7
  38. =643b37ef242fdc35dfdd4551b42393af3eb91a85
  39.  
  40. $ git rev-list --right-only --cherry-mark master...two
  41. =dcbcb2774954437ef0906c6770c7deb924d9286e
  42.  
  43. $ git rev-list --cherry master...branchX
  44.  
  45. $ git rev-list --cherry master...branchX | sed -n -e 's/=//p'
  46.  
  47. $ limit=$(git rev-list --topo-order --cherry master...branchX |
  48. sed -n -e 's/=//p' | head -1)
  49.  
  50. $ git checkout branchX # if needed
  51. $ git rebase --onto master $limit
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement