projects
/
~madcoder
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various updates
[~madcoder/dotfiles.git]
/
gitconfig
diff --git
a/gitconfig
b/gitconfig
index
9ab6411
..
3855ae9
100644
(file)
--- a/
gitconfig
+++ b/
gitconfig
@@
-18,12
+18,18
@@
track=add -N
untrack=rm --cached
track=add -N
untrack=rm --cached
+[merge]
+ tool=diffuse
+
[core]
#editor=gvim -f
editor=vim
excludesfile=/home/madcoder/.git-excludes
preloadindex=true
[core]
#editor=gvim -f
editor=vim
excludesfile=/home/madcoder/.git-excludes
preloadindex=true
+[push]
+ default = tracking
+
[user]
name = Pierre Habouzit
email = madcoder@debian.org
[user]
name = Pierre Habouzit
email = madcoder@debian.org
@@
-35,6
+41,7
@@
status = auto
pager = true
interactive = auto
status = auto
pager = true
interactive = auto
+ grep = auto
[color "diff"]
meta = green
[color "diff"]
meta = green
@@
-49,6
+56,7
@@
untracked = bold yellow
[merge]
verbosity = 1
untracked = bold yellow
[merge]
verbosity = 1
+ conflictstyle = diff3
[clean]
requireForce = false
[pack]
[clean]
requireForce = false
[pack]
@@
-57,3
+65,11
@@
submodulesummary = 1
[push]
default = tracking
submodulesummary = 1
[push]
default = tracking
+
+[sendemail]
+ smtpserver = smtp.mail.intersec.com
+ smtpuser = madcoder
+
+[merge "dpkg-mergechangelogs"]
+ name = debian/changelog merge driver
+ driver = dpkg-mergechangelogs -m %O %A %B %A