2013-01-09 12:20:49 +01:00
|
|
|
# -*- mode:conf -*-
|
2012-07-26 19:16:41 +02:00
|
|
|
[user]
|
2013-07-04 18:49:21 +02:00
|
|
|
email = ambrevar@gmail.com
|
|
|
|
name = Pierre Neidhardt
|
2012-07-26 19:16:41 +02:00
|
|
|
[color]
|
2013-07-04 18:49:21 +02:00
|
|
|
ui = true
|
2012-09-05 11:58:04 +02:00
|
|
|
[alias]
|
2013-07-04 18:49:21 +02:00
|
|
|
b = branch -vva
|
2013-07-11 21:26:19 +02:00
|
|
|
c = commit
|
|
|
|
ca = commit -a
|
2013-07-04 18:49:21 +02:00
|
|
|
co = checkout
|
2013-12-03 21:31:27 +01:00
|
|
|
d = diff --color-words
|
|
|
|
dc = diff --color-words --cached
|
2013-07-04 18:49:21 +02:00
|
|
|
l = log --stat
|
2013-11-12 20:06:03 +01:00
|
|
|
lol = log --graph --decorate --pretty=format:'%C(yellow)%h %Cgreen%cd%C(bold red)%d%Creset %s' --abbrev-commit --date=short
|
2013-07-04 18:49:21 +02:00
|
|
|
m = mergetool
|
|
|
|
r = remote -v
|
|
|
|
s = status -uno
|
2013-12-09 13:13:58 +01:00
|
|
|
su = status -uno -u
|
2013-06-05 18:27:48 +02:00
|
|
|
[push]
|
2013-07-04 18:49:21 +02:00
|
|
|
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
|
2013-07-10 18:31:13 +02:00
|
|
|
## 'ema' is emacs with lightweight configuration.
|
2013-01-09 12:20:49 +01:00
|
|
|
[mergetool.ediff]
|
2013-07-10 18:31:13 +02:00
|
|
|
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\\\"))\"
|
2013-01-09 12:20:49 +01:00
|
|
|
|
2013-01-09 00:56:00 +01:00
|
|
|
[merge]
|
2013-07-04 18:49:21 +02:00
|
|
|
tool = ediff
|
2013-06-26 10:12:47 +02:00
|
|
|
|
2014-01-23 00:10:03 +01:00
|
|
|
[sendemail]
|
|
|
|
smtpencryption = tls
|
|
|
|
smtpserver = smtp.gmail.com
|
|
|
|
smtpuser = ambrevar@gmail.com
|
|
|
|
smtpserverport = 587
|
|
|
|
to = pacman-dev@archlinux.org
|
|
|
|
suppresscc = author
|
|
|
|
# sendemail.confir = auto
|
|
|
|
aliasfiletype = mutt
|
|
|
|
# aliasesfile = ~/.mutt.d/aliases
|
|
|
|
|
2013-06-26 10:12:47 +02:00
|
|
|
[tig]
|
2013-06-26 20:19:17 +02:00
|
|
|
line-graphics = "utf-8"
|
2013-06-26 10:12:47 +02:00
|
|
|
author-width = 12
|
|
|
|
show-author = "abbreviated"
|
2013-06-26 20:19:17 +02:00
|
|
|
show-date = "short"
|
|
|
|
show-id = true
|
2013-06-26 10:12:47 +02:00
|
|
|
line-number-interval = 1
|
|
|
|
[tig "bind"]
|
|
|
|
main = C !git checkout %(commit)
|
2013-06-26 20:28:43 +02:00
|
|
|
main = ^D !git diff %(prompt) %(commit)
|
2013-06-26 10:12:47 +02:00
|
|
|
[tig "color"]
|
|
|
|
date = yellow default
|
|
|
|
date = yellow default
|