Advertisement
Guest User

reeebase

a guest
Jul 31st, 2008
496
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.79 KB | None | 0 0
  1. GIT encourages rebasing, which leads to rebasing of your public and other people's
  2. code. This is bad.
  3.  
  4. Mercurial, which hashes a changeset's place in history as well as it's
  5. content, discourages rebasing. Rebasing happens in private with mq patch queues.
  6. Public trees are merged. This is good.
  7.  
  8. Either style is possible with both tools. The difference is the default emphasis.
  9.  
  10. Defaults matter.
  11.  
  12. Linus Torvalds on rebasing:
  13.  
  14. * http://kerneltrap.org/Linux/Git_Management
  15. * http://lwn.net/Articles/291302/
  16. * http://lwn.net/Articles/291303/
  17. * http://lwn.net/Articles/291304/
  18.  
  19.  
  20. Matt Mackall on synchronizing (pull + merge, don't push, don't rebase):
  21.  
  22. * http://www.selenic.com/pipermail/mercurial/2008-July/020116.html
  23. * http://www.selenic.com/pipermail/mercurial/2008-July/020131.html
  24.  
  25.  
  26.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement