p-oshea/how-to-git

Git repo to show how to use fetch/rebase/review PRs like a boss

how-to-git

A repoo with some branches and some pull requests designed to show how to:

• Make good commits
  • Not too much sausage (squash commits)
  • Not too little sausage (splitt commits)
• Make good Pull Requests
• Review Pull Requests like a boss
• Use the Fetch & Rebase method of working (rather than pull)

Designed to be used in conjunction with my How to git slides.

Notes

Obviously some of this is very opinionated. I am working to the following principles when making this guide:

Good commit messages

This post by Chris Beams delves deep into what makes a good commit message and why.

Good commits

We don't need to see how the sausage is made. A good commit should be the code needed for a single logical change. Nothing more, nothing less.

Making pull requests

Much like the Good commits section above good Pull Requests make everyone's lives easier.

Handy git settings

These are setting which improve over the base setup

Always fast forward merge

As discussed in the slides, merge commits are ugly but that doesn't mean we can't still use the merge functionality of git.

By default merge will try and fast-forward commits without creating a merge commit if possible but will create a merge commit if needed.

With this setting it means it'll throw an error rather create the merge commit which give you the chance to fix the thing causing the merge commit before it happens, keeping you log nice and clean.

$ git config --global merge.ff only