[cup-of-tea]

org-mode and magit are both the best tools in their class, hands down. Git without magit is just awful.