Follow [github flow](http://guides.github.com/overviews/flow/)
Keep PR's small and focused.

Rebase/Merging is user skillset/project specific. Rebase has lots of benefits but its complexity can be dangerous to people who don't completely understand what they are doing. 

Tagging might make sense for Android/iOS but makes less sense for Web/API. 

GIt add -p is also nice but I think its user skillset specific.