diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2013-04-04 16:49:45 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2013-04-04 16:49:45 +0200 |
| commit | 4dc02e648f68575d8a97c1e05500a5915a16d3a2 (patch) | |
| tree | 340eb9d461b95bfa23fa490afc47ca5d19575ead /.gitconfig | |
| parent | b5a1cd3802bea6b3df0e38a7ec5bc34a4a1e0127 (diff) | |
| download | dotfiles-4dc02e648f68575d8a97c1e05500a5915a16d3a2.tar.gz dotfiles-4dc02e648f68575d8a97c1e05500a5915a16d3a2.tar.xz dotfiles-4dc02e648f68575d8a97c1e05500a5915a16d3a2.zip | |
Add .gitconfig
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..ff34927 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,41 @@ +[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 |