mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2024-11-25 12:49:26 +01:00
Mikaela Suomalainen
3d21859967
This fixes a warning on `git pulling` and retains consistent behaviour across my other options that do ff unless there is letter n in the end
59 lines
1.3 KiB
Plaintext
59 lines
1.3 KiB
Plaintext
[user]
|
|
name = Mikaela Suomalainen
|
|
email = mikaela+git@mikaela.info
|
|
signingkey = 0x99392F62BAE30723
|
|
##wtop
|
|
#email = mikaela@unicus.com
|
|
#signingkey = 0x440D764E4F4A6C2D
|
|
[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
|
|
[gpg]
|
|
program = gpg2
|
|
[gpgv]
|
|
program = gpgv2
|
|
[tag]
|
|
forceSignAnnotated = true
|
|
[pull]
|
|
ff = only
|