summaryrefslogtreecommitdiff
path: root/mut/git/config
diff options
context:
space:
mode:
authorMike Vink <59492084+ivi-vink@users.noreply.github.com>2025-01-22 14:19:59 +0100
committerMike Vink <59492084+ivi-vink@users.noreply.github.com>2025-01-22 14:19:59 +0100
commit3000da50139ff3b044c5742140bc1ede8e3f4ad6 (patch)
treec20dc0d4851ef2c9163392b9c5441b51a174b85d /mut/git/config
parent6043502305e3d5ccc6c537d4ed085d8b2454c5c8 (diff)
fix git and nushell
Diffstat (limited to 'mut/git/config')
-rw-r--r--mut/git/config25
1 files changed, 25 insertions, 0 deletions
diff --git a/mut/git/config b/mut/git/config
new file mode 100644
index 0000000..9d9b277
--- /dev/null
+++ b/mut/git/config
@@ -0,0 +1,25 @@
+[commit]
+ gpgsign = false
+
+[gpg]
+ format = "ssh"
+
+[merge]
+ tool = "fugitive"
+
+[mergetool "fugitive"]
+ cmd = "vim -f -c \"Gdiff\" \"$MERGED\""
+
+[user]
+ email = "ivi@vinkies.net"
+ name = "Mike Vink"
+ signingKey = "/Users/ivi/.ssh/id_ed25519_sk.pub"
+
+[worktree]
+ guessRemote = true
+
+[includeIf "hasconfig:remote.*.url:git@github.com:**/**"]
+ path = "/nix-config/mut/git/github"
+
+[includeIf "hasconfig:remote.*.url:https://github.com/**/**"]
+ path = "/nix-config/mut/git/github"