mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2024-11-22 11:19:22 +01:00
gitconfig: avoid merge-commits & move user to top
This commit is contained in:
parent
622896d455
commit
9b08d843a0
@ -1,3 +1,7 @@
|
|||||||
|
[user]
|
||||||
|
name = Mikaela Suomalainen
|
||||||
|
email = mikaela.suomalainen@outlook.com
|
||||||
|
signingkey = 0xDAA6CA08F2E96AC7
|
||||||
[alias]
|
[alias]
|
||||||
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
|
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
|
||||||
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
|
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
|
||||||
@ -18,11 +22,9 @@
|
|||||||
showbranch = true
|
showbranch = true
|
||||||
status = true
|
status = true
|
||||||
ui = true
|
ui = true
|
||||||
[user]
|
|
||||||
name = Mikaela Suomalainen
|
|
||||||
email = mikaela.suomalainen@outlook.com
|
|
||||||
signingkey = 0xDAA6CA08F2E96AC7
|
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
[credential]
|
[credential]
|
||||||
helper = cache --timeout=86400
|
helper = cache --timeout=86400
|
||||||
|
[merge]
|
||||||
|
ff = only
|
||||||
|
12
gitconfig
12
gitconfig
@ -1,3 +1,7 @@
|
|||||||
|
[user]
|
||||||
|
# name = Mikaela Suomalainen
|
||||||
|
# email = mikaela.suomalainen@outlook.com
|
||||||
|
# signingkey = 0xDAA6CA08F2E96AC7
|
||||||
[alias]
|
[alias]
|
||||||
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
|
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
|
||||||
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
|
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
|
||||||
@ -18,11 +22,9 @@
|
|||||||
showbranch = true
|
showbranch = true
|
||||||
status = true
|
status = true
|
||||||
ui = true
|
ui = true
|
||||||
[user]
|
|
||||||
# name = Mikaela Suomalainen
|
|
||||||
# email = mikaela.suomalainen@outlook.com
|
|
||||||
# signingkey = 0xDAA6CA08F2E96AC7
|
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
[credential]
|
[credential]
|
||||||
helper = cache --timeout=86400
|
helper = cache --timeout=86400
|
||||||
|
[merge]
|
||||||
|
ff = only
|
||||||
|
Loading…
Reference in New Issue
Block a user