My gitconfig

.gitconfig

[user]
        name = Ivan Poon
        email = ravenxce@gmail.com
[alias]
        lol = log --pretty=oneline --abbrev-commit --graph --decorate
        ds = diff --stat
[log]
        decorate = short
[filter "media"]
        clean = git-media-clean %f
        smudge = git-media-smudge %f
[push]
        default = simple
[merge]
        ff = no
        tool = Kaleidoscope
[pull]
        ff = only
[mergetool "Kaleidoscope"]
        cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
        trustexitcode = true
[difftool "Kaleidoscope"]
        cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
        prompt = false
[mergetool]
        prompt = false
[diff]
        tool = Kaleidoscope
[color]
        ui = true