ambevar-dotfiles/.gitconfig

29 lines
1011 B
INI
Raw Normal View History

2013-01-09 12:20:49 +01:00
# -*- mode:conf -*-
[user]
email = ambrevar@gmail.com
2013-01-09 12:20:49 +01:00
name = Pierre Neidhardt
[color]
ui = true
[alias]
2013-06-04 17:11:51 +02:00
b = branch -vva
c = commit -a
co = checkout
d = diff --cached
2013-01-14 22:03:14 +01:00
l = log --stat
2013-03-04 17:31:57 +01:00
lol = log --graph --decorate --pretty=oneline --abbrev-commit
2013-01-09 12:20:49 +01:00
m = mergetool
2013-01-20 10:18:25 +01:00
r = remote -v
2013-01-09 12:20:49 +01:00
s = status -uno
2013-06-05 18:27:48 +02:00
[push]
default = current
2013-01-09 12:20:49 +01:00
## Ediff merge tool.
## See:
## http://kerneltrap.org/mailarchive/git/2007/7/1/250424
## http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool
[mergetool.ediff]
cmd = emacs -q -l ~/.emacs-light --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\\\"))\"
2013-01-09 12:20:49 +01:00
[merge]
2013-01-09 12:20:49 +01:00
tool = ediff