[user] name = Jan Pokorný email = jpokorny@redhat.com [alias] c = commit -s [core] editor = vim [color] branch = auto diff = auto status = auto [color "branch"] current = yellow reverse local = yellow remote = green [color "diff"] meta = yellow bold frag = magenta bold old = red bold new = green bold [color "status"] added = yellow changed = green untracked = cyan # http://lukas.zapletalovi.com/2012/06/three-way-git-merging-and-meld.html [merge] tool = mymeld conflictstyle = diff3 [mergetool "mymeld"] cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE [sendemail] smtpserver = smtp.corp.redhat.com