/explore

Click through on any links that interest you or select the planets on the right to continue exploring the Outer Web.
You are here

paul.stadig.name
| | www.integralist.co.uk

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:
3.2 parsecs

Travel
| |
| | pboyd.io

Small Git commits are great when working, but they aren't so great when looking at the history. This post examines the commands to make a clean Git history.
2.3 parsecs

Travel
| |
| | blog.dnsimple.com

A retrospective of the last two years where we adopted --squash as our default merge strategy for git branches.
3.2 parsecs

Travel
| |
| | blog.kdgregory.com

I like to provide a nice, clean history in my pull requests. Reviewers should be able to follow each commit, and see how the functional...
10.3 parsecs

Travel
|