shell-things/conf/gitconfig

[user]
	#name = Aminda Suomalainen
	#email = suomalainen+git@mikaela.info
	# Email stored on my FINEID
	#email = suomalainen@mikaela.info
	# Aminda Suomalainen FINEID 20.12.2021-20.12.2026
	# NOTE: This is a PUBLIC key, the secret key is non-exportable on
	# the SMARTCARD. See also https://gitea.blesmrt.net/mikaela/ssh-allowed_signers/src/branch/cxefa/README.md#where-to-find-keys
	#signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM=
	#signingkey = ~/.ssh/id_ed25519.pub
	#signingkey = 0x414E406A
	##wtop
	#email = mikaela+digitalents@mikaela.info
	#signingkey = 0xDF046339D69EB8C9
[alias]
	cleandi = clean -di
	cleandix = clean -dix
	# From http://progit.org/book/ch2-7.html
	last = cat-file commit HEAD
	mergen = merge --no-ff
	pulln = pull --no-ff
	pullen = pull --no-ff
	verify = verify-commit HEAD

[core]
	editor = nvim
	autocrlf = input
	safecrlf = warn
[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
	autoSetupRemote = true
	recurseSubmodules = on-demand
[credential]
	helper = cache --timeout=86400
[merge]
	ff = only
	renormalize = true
[format]
	signOff = true
[commit]
	gpgsign = true
[diff]
	compactionHeuristic = true
	algorithm = histogram
[pager]
#	 log = diff-highlight | less
#	 show = diff-highlight | less
#	 diff = diff-highlight | less
[interactive]
#	 diffFilter = diff-highlight
[gpg]
	format = ssh
	#format = x509
[gpg "ssh"]
	allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
#[gpg "x509"]
#	program = gpgsm
[tag]
	forceSignAnnotated = true
[pull]
	ff = only
[init]
	defaultBranch = cxefa
	# https://pre-commit.com/#pre-commit-init-templatedir
	# pre-commit init-templatedir ~/.git-template
	templateDir = ~/.git-template
[advice]
	# I am not developing in detached head state, I generally want to compile
	# a specific version of a program and I know how to get out of it
	detachedHead = false
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[status]
	submodulesummary = 1
[submodule]
	recurse = true
[lfs]
	setlockablereadonly = true
	locksverify = true
[log]
	mailmap = true
	showSignature = true
# https://sandrotosi.blogspot.com/2020/10/multiple-git-configurations-depending.html?m=1
# see also .mikaela/src2-gitconfig within the same shell-things repo
[includeIf "gitdir:~/src2/"]
	path = ~/src2/gitconfig
gitconfig: avoid merge-commits & move user to top 2014-10-05 21:30:10 +02:00			`[user]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`#name = Aminda Suomalainen`
			`#email = suomalainen+git@mikaela.info`
.gitconfig: add a FINEID comment, unify gpg sections 2023-02-21 09:16:12 +01:00			`# Email stored on my FINEID`
gitconfig: add commented x509 configuration I didn't get it to work in the end 2023-02-21 09:10:19 +01:00			`#email = suomalainen@mikaela.info`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`# Aminda Suomalainen FINEID 20.12.2021-20.12.2026`
gitconfig: add a comment that the signingkey is PUBLIC KEY 2023-02-22 11:50:46 +01:00			`# NOTE: This is a PUBLIC key, the secret key is non-exportable on`
			`# the SMARTCARD. See also https://gitea.blesmrt.net/mikaela/ssh-allowed_signers/src/branch/cxefa/README.md#where-to-find-keys`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			#signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM=
			`#signingkey = ~/.ssh/id_ed25519.pub`
gitconfig: add commented x509 configuration I didn't get it to work in the end 2023-02-21 09:10:19 +01:00			`#signingkey = 0x414E406A`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`##wtop`
			`#email = mikaela+digitalents@mikaela.info`
			`#signingkey = 0xDF046339D69EB8C9`
gitconfig: First commit. It doesn't have user nor github blocks, see http://help.github.com/ for help about adding them. I am probably soon committing my vimrc too. 2011-12-31 20:28:31 +01:00			`[alias]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`cleandi = clean -di`
			`cleandix = clean -dix`
			`# From http://progit.org/book/ch2-7.html`
			`last = cat-file commit HEAD`
			`mergen = merge --no-ff`
			`pulln = pull --no-ff`
			`pullen = pull --no-ff`
			`verify = verify-commit HEAD`
gitconfig: sort aliases & add mergen & pulln git merge & git pull with --no-ff 2014-10-08 22:28:16 +02:00
gitconfig: First commit. It doesn't have user nor github blocks, see http://help.github.com/ for help about adding them. I am probably soon committing my vimrc too. 2011-12-31 20:28:31 +01:00			`[core]`
gitconfig editor nvim Ref: #151 2023-02-14 21:44:28 +01:00			`editor = nvim`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`autocrlf = input`
gitconfig: core.safecrlf warn 2023-02-14 21:42:47 +01:00			`safecrlf = warn`
gitconfig: First commit. It doesn't have user nor github blocks, see http://help.github.com/ for help about adding them. I am probably soon committing my vimrc too. 2011-12-31 20:28:31 +01:00			`[color]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`# 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`
gitconfig: push.default simple 2014-05-25 16:28:49 +02:00			`[push]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`default = current`
			`gpgSign = if-asked`
gitconfig: add push.autoSetupRemote=true & lfs filter The later was automatic that I haven't just noticed for committing before 2023-01-24 07:24:47 +01:00			`autoSetupRemote = true`
gitconfig: add submodule configuration 2023-01-25 11:48:37 +01:00			`recurseSubmodules = on-demand`
gitconfig: cache passwords for 24 hours 2014-07-14 20:17:14 +02:00			`[credential]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`helper = cache --timeout=86400`
gitconfig: avoid merge-commits & move user to top 2014-10-05 21:30:10 +02:00			`[merge]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`ff = only`
gitconfig: enable merge verifySignatures & renormalize, log mailmap & showsignature 2023-03-31 08:21:57 +02:00			`renormalize = true`
gitconfig: add format.signoff true 2015-02-14 21:48:03 +01:00			`[format]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`signOff = true`
gitconfig: enable signing all commits 2016-04-09 12:04:48 +02:00			`[commit]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`gpgsign = true`
gitconfig: add new options closes #88 2016-06-20 18:00:04 +02:00			`[diff]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`compactionHeuristic = true`
gitconfig: use diff.algorithm = histogram Gitea git defaults to it and I didn't see anything against it in current git versions by search 2023-05-24 10:21:42 +02:00			`algorithm = histogram`
gitconfig: add new options closes #88 2016-06-20 18:00:04 +02:00			`[pager]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`# log = diff-highlight \| less`
			`# show = diff-highlight \| less`
			`# diff = diff-highlight \| less`
gitconfig: add new options closes #88 2016-06-20 18:00:04 +02:00			`[interactive]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`# diffFilter = diff-highlight`
gitconfig: force gpg2 + sign annotated tags 2019-12-08 10:52:16 +01:00			`[gpg]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`format = ssh`
gitconfig: add commented x509 configuration I didn't get it to work in the end 2023-02-21 09:10:19 +01:00			`#format = x509`
.gitconfig: add a FINEID comment, unify gpg sections 2023-02-21 09:16:12 +01:00			`[gpg "ssh"]`
			`allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers`
			`#[gpg "x509"]`
			`# program = gpgsm`
gitconfig: force gpg2 + sign annotated tags 2019-12-08 10:52:16 +01:00			`[tag]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`forceSignAnnotated = true`
gitconfig: pull.ff only 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 2020-06-13 21:12:12 +02:00			`[pull]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`ff = only`
gitconfig: make cxefa the default branch for git init 2020-09-13 16:55:34 +02:00			`[init]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`defaultBranch = cxefa`
git: enable templateDir 2023-05-04 12:35:00 +02:00			`# https://pre-commit.com/#pre-commit-init-templatedir`
			`# pre-commit init-templatedir ~/.git-template`
			`templateDir = ~/.git-template`
gitconfig: disable advice on detachedHead state 2022-05-05 13:47:13 +02:00			`[advice]`
gitconfig: retab as I am bothered by the mix it had 2023-02-12 13:26:58 +01:00			`# I am not developing in detached head state, I generally want to compile`
			`# a specific version of a program and I know how to get out of it`
			`detachedHead = false`
gitconfig: add push.autoSetupRemote=true & lfs filter The later was automatic that I haven't just noticed for committing before 2023-01-24 07:24:47 +01:00			`[filter "lfs"]`
			`clean = git-lfs clean -- %f`
			`smudge = git-lfs smudge -- %f`
			`process = git-lfs filter-process`
			`required = true`
gitconfig: add submodule configuration 2023-01-25 11:48:37 +01:00			`[status]`
			`submodulesummary = 1`
			`[submodule]`
			`recurse = true`
gitconfig: verify lfs locks & set lockable read-only (unless locked) 2023-01-30 07:38:06 +01:00			`[lfs]`
			`setlockablereadonly = true`
			`locksverify = true`
gitconfig: enable merge verifySignatures & renormalize, log mailmap & showsignature 2023-03-31 08:21:57 +02:00			`[log]`
			`mailmap = true`
			`showSignature = true`
gitconfig: add another persona Resolves: #84 2023-06-17 09:48:07 +02:00			`# https://sandrotosi.blogspot.com/2020/10/multiple-git-configurations-depending.html?m=1`
			`# see also .mikaela/src2-gitconfig within the same shell-things repo`
			`[includeIf "gitdir:~/src2/"]`
			`path = ~/src2/gitconfig`