ambevar-dotfiles/.gitconfig

# -*- mode:conf -*-
[user]
    email = ambrevar@gmail.com
    name = Pierre Neidhardt
[color]
    ui = true
[alias]
    b = branch -vva
    c = commit
    ca = commit -a
    co = checkout
    d = diff --color-words
    dc = diff --color-words --cached
    l = log --stat
    lol =  log --graph --decorate --pretty=format:'%C(yellow)%h %Cgreen%cd%C(bold red)%d%Creset %s' --abbrev-commit --date=short
    m = mergetool
    r = remote -v
    s = status -uno
    su = status -uno -u
[push]
    default = current

## Ediff merge tool.
## See:
##   http://kerneltrap.org/mailarchive/git/2007/7/1/250424
##   http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool
## 'ema' is emacs with lightweight configuration.
[mergetool.ediff]
    cmd = ema --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"

[merge]
    tool = ediff

[tig]
    line-graphics = "utf-8"
    author-width = 12
    show-author = "abbreviated"
    show-date = "short"
    show-id = true
    line-number-interval = 1
[tig "bind"]
     main = C !git checkout %(commit)
     main = ^D !git diff %(prompt) %(commit)
[tig "color"]
     date = yellow default
     date = yellow default