• git-gutter
• Navigation among git hunks
• smerge-mode