Git mergetool kdiff3 setting for Mac

[difftool "kdiff3"]
    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
    trustExitCode = false
[difftool]
    prompt = false
[diff]
    tool = kdiff3
[mergetool "kdiff3"]
    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
    trustExitCode = false
[mergetool]
    keepBackup = false
[merge]
    tool = kdiff3

git diff ignore line ending

Different line ending is really annoying, here is the command to ignore line ending when diff:
$ git config --global core.autocrlf true

configure git with color

To display color in the output of git diff, you need to configure git. Try running

$ git config --global color.diff true

to set your $HOME/.gitconfig appropriately.
To enable color for all:

$ git config --global color.ui true

Amazon AWS EC2 web server & git server set up

http://codelikezell.com/setting-up-rails-mysql-php-apache-and-git-on-ec2/
https://help.ubuntu.com/community/EC2StartersGuide
http://paulstamatiou.com/how-to-getting-started-with-amazon-ec2