1 files changed, 42 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 89c3174..d167d6e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,45 @@
 [user]
 	email = maciej@sobkow.ski
 	name = Maciej Sobkowski
+[push]
+	default = simple
+[core]
+	editor = nvim
+[alias]
+	ls = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen%cr%Creset %Cblue%an <%ae>%Creset' --abbrev-commit --date=relative --all
+	l  = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen%cr%Creset %Cblue%an <%ae>%Creset' --abbrev-commit --date=relative
+	d  = diff
+	dc = diff --cached
+[color]
+	ui = auto
+[merge]
+	tool = vimdiff
+[mergetool]
+	prompt = true
+[mergetool "vimdiff"]
+	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[sendemail]
+	smtpuser = maciej@sobkow.ski
+	smtpserver = fireball.sobkow.ski
+	smtpserverport = 25
+	smtpencryption = tls
+[commit]
+	verbose = true
+[fetch]
+	prune = true
+[mergetool]
+	keepBackup = false
+[filter "lfs"]
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+[http]
+	sslverify = false
+	cookiefile = /home/mjsob/.gitcookies
+[init]
+	defaultBranch = main
+[rebase]
+	autoStash = true
+[diff]
+	algorithm = histogram