diff options
| author |  Tom Willemsen | 2011-12-03 16:22:46 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2011-12-03 16:27:53 +0100 |
| commit | a481eb656812ba084065a24cafbdea85b94a5a66 (patch) | |
| tree | dea4d33b7774f3014ce4ce21167152969c2e674f /.gitconfig | |
| parent | 61c152d2f63aaf4d756b296b8adb2d1c4315cf9e (diff) | |
| download | dotfiles-a481eb656812ba084065a24cafbdea85b94a5a66.tar.gz dotfiles-a481eb656812ba084065a24cafbdea85b94a5a66.zip | |
GIT & XDEFAULTS: email adress, merge tool, colors
Git:
email address has been changed and the merge tool has been set to
emerge (as trial).
Xdefaults:
Changed the colors.
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,6 +1,6 @@ [user] name = Tom Willemsen - email = ryuslash@gmail.com + email = tom@ryuslash.org [core] editor = emacs -nw [color] @@ -15,3 +15,5 @@ smtpserver = smtp.gmail.com smtpuser = ryuslash@gmail.com smtpserverport = 587 +[merge] + tool = emerge |