[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 [status] submodulesummary = 1 [submodule] recurse = true [lfs] setlockablereadonly = true locksverify = true [log] mailmap = true showSignature = true [include] path = ~/.gitconfig2 # https://sandrotosi.blogspot.com/2020/10/multiple-git-configurations-depending.html?m=1 # see also .mikaela/2src-gitconfig within the same shell-things repo [includeIf "gitdir:~/2src/"] path = ~/2src/gitconfig