[user] # name = Mikaela Suomalainen # email = mikaela+git@mikaela.info # signingkey = 0x0C207F07B2F32B67 [alias] cleandi = clean -di cleandix = clean -dix # From http://progit.org/book/ch2-7.html last = cat-file commit HEAD # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121 mergen = merge --no-ff pulln = pull --no-ff pullen = pull --no-ff shorten = "!sh -c 'curl -i http://git.io -F url=$1' -" [core] editor = vim autocrlf = input [color] # From git manpage and http://book.git-scm.com/5_customizing_git.html branch = true diff = true grep = true interactive = true pager = true showbranch = true status = true ui = true [push] default = current gpgSign = if-asked [credential] helper = cache --timeout=86400 [merge] ff = only [format] signOff = true [commit] gpgsign = true [diff] compactionHeuristic = true [pager] # log = diff-highlight | less # show = diff-highlight | less # diff = diff-highlight | less [interactive] # diffFilter = diff-highlight