X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.gitconfig;h=5ea696d8134e7383874dafebb118753b49aac5b9;hp=0b649b0f1d0c7e96005d590f9ff8e0209ed2f1e0;hb=f4ccb17bb7b532041caf6c4709a3b1fe31f5e38a;hpb=9d552e73abda2b6efa47e9311e5b421a71eb241c

diff --git a/.gitconfig b/.gitconfig
index 0b649b0..5ea696d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,4 +1,36 @@
 [user]
+	name = Jan Kratochvil
 	email = jan.kratochvil@redhat.com
 [merge]
 	conflictstyle = diff3
+[color]
+	ui = never
+[pull]
+	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
+[alias]
+	co = checkout
+	ci = commit
+	st = status
+	br = branch
+	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+[pager]
+	branch = off
+[branch]
+	sort = committerdate
+# FIXME: It does not work:
+[blame]
+        ignoreRevsFile = ~/.gitconfig-ignoreblamecommit
+[format]
+	signature =