From 1e32c6293afce49b9a5298c2abcf908fda7aec73 Mon Sep 17 00:00:00 2001 From: Proctor Date: Mon, 13 Apr 2026 17:58:44 -0500 Subject: [PATCH] git: update gitconfig --- git/.gitconfig | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/git/.gitconfig b/git/.gitconfig index 3221e92..f737264 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,25 +1,37 @@ -# This is Git's per-user configuration file. [user] - email = steven.proctor@gmail.com name = Proctor - + email = steven.proctor@gmail.com [core] editor = nvim excludesFile = ~/.gitignore.global +[color] + ui = true +[pull] + ff = only +[filter "media"] + clean = git-media-clean %f + smudge = git-media-smudge %f [init] defaultBranch = main - [alias] ; Command aliases for the git[1] command wrapper last = cat-file commit HEAD [branch] autoSetupRebase = always [checkout] defaultRemote = origin +[gpg] + format = ssh +[commit] + gpgsign = true +[tag] + gpgsign = true +[gpg "ssh"] + allowedSignersFile = ~/.ssh/allowed_signers [merge] - ff = only + ff = only [push] - autoSetupRemote = true - default = upstream + default = current + autoSetupRemote = true [rerere] enabled = true [remote] @@ -28,5 +40,3 @@ ;; This is last, take in any other local file overrides [include] path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory -[pull] - ff = only