diff options
| author | David Robillard <d@drobilla.net> | 2025-06-06 17:55:08 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2025-06-06 17:55:08 -0400 |
| commit | 7a970c252196d9efd96e9286d8faf912e9b098df (patch) | |
| tree | 1a212b1ceff316fb2afcd5d74aaa600e74d30f11 /git | |
| parent | 83051de1196eb1bd78d2ae31e804f7462d304056 (diff) | |
| download | dotfiles-main.tar.gz dotfiles-main.tar.bz2 dotfiles-main.zip | |
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..b5e501d --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,23 @@ +[user] + email = d@drobilla.net + name = David Robillard +[merge] + conflictstyle = zdiff3 +[pull] + ff = only +[init] + defaultBranch = main +[rerere] + enabled = true + autoupdate = true +[diff] + colorMoved = plain + mnemonicPrefix = true + renames = true + algorithm = histogram +[tag] + sort = version:refname +[branch] + sort = -committerdate +[advice] + mergeConflict = false |