shell-things/gitconfig
Mikaela Suomalainen 5afe3a716b gitconfig: sort aliases & add mergen & pulln
git merge & git pull with --no-ff
2014-10-08 23:28:16 +03:00

34 lines
819 B
Plaintext

[user]
# name = Mikaela Suomalainen
# email = mikaela.suomalainen@outlook.com
# signingkey = 0xDAA6CA08F2E96AC7
[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
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
[credential]
helper = cache --timeout=86400
[merge]
ff = only