X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=.gitconfig;h=191f05f05429dc36e2709700a734565693927b04;hb=4aa02f02edaace035a6821b7fcd4fbb72bc8a558;hp=dfaec756b75d5792685fa0ff51eda1623548344a;hpb=130720a063b17573d87ddb11cadfb59544d17afe;p=nethome.git

diff --git a/.gitconfig b/.gitconfig
index dfaec75..191f05f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,13 +13,6 @@
 	ff = only
 #	rebase = true
 
-# ChangeLog merge attempt:
-#[merge "git-merge-changelog"]
-#	name = git-merge-changelog
-#	driver = /usr/bin/git-merge-changelog %O %A %B
-# ChangeLog merge attempt:
-#[core]
-#	attributesfile = ~/.gitattributes
 # golang:
 #[http]
 #	cookiefile = /home/jkratoch/.gitcookies