ear1grey/workflow — pull request #3 by dylanrhysscott (2014-07-31 17:41:56+00:00)
Title: Returning to an earlier commit, logging and rebase syncing

Added a further three sections:

An alternative workflow to pull / merge using rebase - This avoids messy merging commits and unneeded conflict resolution commits. Rebase replays all update commits from remote and then appends your work to keep a clean linear history.

How to return to an earlier repo state cleanly

Logging and advanced logging commands to provide better history feedback