I never used git sfr but git stp is useful
Ruby keywords
Conform to the norm
Use git-smart https://github.com/geelen/git-smart
More @tpope goodness