Explore >> Select a destination

You are here

 blog.dnsimple.com
Two years of squash merge - DNSimple Blog
| | initialcommit.com
Git Rebase | A Guide to Rebasing in Git
2.7 parsecs away

Travel
| | Learn both the theory and practice of git rebase in this comprehensive yet concise guide.
| | www.integralist.co.uk
Git Merge Strategies ? Mark McDonnell
2.8 parsecs away

Travel
| | Introduction git merge git merge --no-ff --edit git reset Force the merge commit git branch --contains Losing useful history git merge --squash git rebase git rebase --interactive git rebase --onto git format-patch Conclusion Introduction Imagine I have a master branch with one commit: 75eb1cb - (origin/master) README This is a single README.md file with the following content: - A: 1 Now imagine I have a branch from master called feat/foo and in that branch I've made 3 additional commits:
| | mislav.net
Git merge vs. rebase
2.2 parsecs away

Travel
| | How to settle on whether to merge or rebase at specific points in a team-shared git workflow.
| | andrew.yurisich.com
Git Off My Lawn ยท Andrew Yurisich
20.7 parsecs away

Travel
|