[user] name = Arti Zirk email = arti.zirk@gmail.com [merge] tool = meld conflictStyle = zdiff3 keepbackup = false [alias] plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches ls = "! for file in $(ls --group-directories-first -p); do git log -n 1 --pretty=\"format:${file}|%s|%ar%n\" -- $file; done | column -s'|' -t -T 2" [web] browser = firefox [browser "firefox"] path = firefox-developer-edition [instaweb] httpd = webrick [core] editor = nvim quotepath = false commitGraph = true [credential] helper = /usr/lib/git-core/git-credential-libsecret [sendemail] smtpEncryption = tls smtpServer = smtp.gmail.com smtpUser = arti.zirk@gmail.com smtpServerPort = 587 [diff] wsErrorHighlight = all algorithm = histogram [cola] spellcheck = false [push] followTags = true autoSetupRemote = true [gui] spellingdictionary = en [pull] ff = only [init] defaultBranch = master [rerere] enabled = true [receive] advertisePushOptions = true [gc] writeCommitGraph = true [color] ui = auto [core] abbrev = 12 [pretty] fixes = Fixes: %h (\"%s\") [tag] sort = v:refname [protocol "file"] allow = always [column] ui = auto [rebase] autosquash = true [branch] sort = -committerdate [fetch] prune = true [includeIf "gitdir:~/code/messente/"] path = ~/code/messente/gitconfig