Guest User

Untitled

a guest
May 21st, 2018
83
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.55 KB | None | 0 0
  1. > Sum [dev] branch revisions into a single merge commit on [target] branch (Like Pull Request)
  2.  
  3. ```
  4. git checkout [target]
  5. git pull
  6. git merge [dev] --no-ff -m "message"
  7. git push
  8. ```
  9.  
  10. > Cherry Pick
  11.  
  12. ```
  13. // One commit
  14. git checkout [targetBranch]
  15. git cherry-pick <srcCommitHash>
  16. ```
  17.  
  18. ```
  19. // squash range of commits
  20. git checkout [targetBranch]
  21.  
  22. // two separate commits
  23. git cherry-pick -n <srcCommitHash1> <srcCommitHash2>
  24. // or a range from commit 1 to commit 3
  25. git cherry-pick -n <srcCommitHash1>..<srcCommitHash3>
  26.  
  27. git add .
  28. git commit -m "message"
  29. git push
  30. ```
Add Comment
Please, Sign In to add comment