[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 =