Merge branch 'master' of github.com:peterhurford/git-aliases.zsh

Add rebase

Merge pull request #21 from peterhurford/reset_file

reset a file

NEWS

Add flog, cobd, and corbd

Merge pull request #16 from peterhurford/more_and_piping

Protect more git actions with `&&` piping

Merge pull request #15 from peterhurford/pull_before_backmerging

Pull before backmerging

Merge pull request #14 from peterhurford/release

Release