# This is Git's per-user configuration file. [user] # Please adapt and uncomment the following lines: # name = Kevin Heinicke # email = kheinicke@kheinick-mbp2.dyndns.cern.ch [user] email = kevin@kehei.de name = Kevin Heinicke [core] excludesfile = /Users/kheinicke/.gitignore_global [diff] tool = opendiff [difftool] prompt = false [difftool "opendiff"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" -merge \"$MERGED\" | cat [merge] tool = opendiff