~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
[profile]
/
gitconfig
diff --git
a/gitconfig
b/gitconfig
index
9be32a3
..
4d8eb77
100644
(file)
--- a/
gitconfig
+++ b/
gitconfig
@@
-7,6
+7,10
@@
[merge]
summary = true
[merge]
summary = true
+ tool = emerge
+
+[mergetool "emerge"]
+ path = emerge-hack
[diff]
renames = copies
[diff]
renames = copies
@@
-54,3
+58,7
@@
[mail "alias"]
git = git@vger.kernel.org
mdw = mdw@distorted.org.uk
[mail "alias"]
git = git@vger.kernel.org
mdw = mdw@distorted.org.uk
+
+[gui]
+ fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
+ fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0