config/git, branch trunk configuration files https://git.herrmann.dev/cgit/config/atom?h=trunk 2024-02-16T22:01:25Z git: some new settings 2024-02-16T22:01:25Z Reiner Herrmann reiner@reiner-h.de 2024-02-16T22:01:25Z urn:sha1:f25d78defbbf8b195e5aa1494dbd5888c9c08c18 inspired by https://jvns.ca/blog/2024/02/16/popular-git-config-options/ git: use 'trunk' as default branch name 2023-05-15T18:28:25Z Reiner Herrmann reiner@reiner-h.de 2023-05-15T18:28:25Z urn:sha1:dc3754638498a79a6bdfe7a28cda63b06d03d42e git: don't use gpg2, which is now only a transitional symlink 2023-03-20T22:18:48Z Reiner Herrmann reiner@reiner-h.de 2023-03-20T22:18:48Z urn:sha1:7b8fcc7cd610bf6f0cea463e49008ec302387994 git: rewrite salsa push urls 2023-01-03T18:15:56Z Reiner Herrmann reiner@reiner-h.de 2023-01-03T18:15:56Z urn:sha1:21b54f0b5a4bf7d669b8616e2712e452a59048b3 git: point to XDG_CONFIG_HOME 2023-01-02T18:33:33Z Reiner Herrmann reiner@reiner-h.de 2023-01-02T18:33:33Z urn:sha1:7e5d957ce8e22338a3cda5023f8fb8e8049ece86 git: enable autostashing for merges 2022-10-02T23:43:06Z Reiner Herrmann reiner@reiner-h.de 2022-10-02T23:43:06Z urn:sha1:ac4ec38f44387963862a40db6b9fe212f10c0f82 git: display branches in columns 2022-10-02T23:40:48Z Reiner Herrmann reiner@reiner-h.de 2022-10-02T23:40:48Z urn:sha1:476cc883bcb0e1c0097187e05fdc8571598efaa0 git: allow only fast-forwards when pulling 2020-05-23T09:08:26Z Reiner Herrmann reiner@reiner-h.de 2020-05-23T09:08:26Z urn:sha1:8aed500052fda6280e965059cc4af1ed0ab32cb8 since 2.27 git warns if no pull strategy is configured. options are merging, rebasing or allowing only ffs. as both merging and rebasing can be annoying, try to only use ffs. if that's not possible, manual merging/rebasing is still possible. select histogram diff in vim and git 2020-02-17T19:51:23Z Reiner Herrmann reiner@reiner-h.de 2020-02-17T19:51:23Z urn:sha1:41138afae2b70c21ba48d4de38404bf804bcb0a7 Scientifically determined to be the best one for code: https://link.springer.com/article/10.1007/s10664-019-09772-z git: commandline compatibility to universal-ctags in ctags hook script 2018-11-24T11:24:38Z Reiner Herrmann reiner@reiner-h.de 2018-11-24T11:24:38Z urn:sha1:517b2737dc6dcd97a26cfbf4f834172cb9cdae0b