Add git branch name in prompt
Add editor and merge setting for git