Updated Configuration (markdown)
Add section: a better git diff output using diff-highlight
Configure git pull to rebase by default
Add a section about merge tool
Created Configuration (markdown)