gitconfig: avoid merge-commits & move user to top

This commit is contained in:
Mikaela Suomalainen 2014-10-05 22:30:10 +03:00
parent 622896d455
commit 9b08d843a0
2 changed files with 14 additions and 10 deletions

View File

@ -1,3 +1,7 @@
[user]
name = Mikaela Suomalainen
email = mikaela.suomalainen@outlook.com
signingkey = 0xDAA6CA08F2E96AC7
[alias]
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
@ -18,11 +22,9 @@
showbranch = true
status = true
ui = true
[user]
name = Mikaela Suomalainen
email = mikaela.suomalainen@outlook.com
signingkey = 0xDAA6CA08F2E96AC7
[push]
default = current
[credential]
helper = cache --timeout=86400
[merge]
ff = only

View File

@ -1,3 +1,7 @@
[user]
# name = Mikaela Suomalainen
# email = mikaela.suomalainen@outlook.com
# signingkey = 0xDAA6CA08F2E96AC7
[alias]
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
@ -18,11 +22,9 @@
showbranch = true
status = true
ui = true
[user]
# name = Mikaela Suomalainen
# email = mikaela.suomalainen@outlook.com
# signingkey = 0xDAA6CA08F2E96AC7
[push]
default = current
[credential]
helper = cache --timeout=86400
[merge]
ff = only