summaryrefslogtreecommitdiff
path: root/.config/git
diff options
context:
space:
mode:
authorMike Vink <mike@pionative.com>2025-02-08 08:16:07 +0100
committerMike Vink <mike@pionative.com>2025-02-08 08:16:07 +0100
commit7d30d2272ef59166c1b382cab324a400a42d577d (patch)
tree8f153f04818c7622b9cd2a3e1a18f9dcce1a1104 /.config/git
parentfd48011d2ef530b392df72e8685da4e8a2a54d1d (diff)
copy config
Diffstat (limited to '.config/git')
-rw-r--r--.config/git/config24
-rw-r--r--.config/git/github2
-rw-r--r--.config/git/ignore6
3 files changed, 32 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..d8d52cb
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,24 @@
+[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"
diff --git a/.config/git/github b/.config/git/github
new file mode 100644
index 0000000..421194d
--- /dev/null
+++ b/.config/git/github
@@ -0,0 +1,2 @@
+[user]
+ email = "59492084+ivi-vink@users.noreply.github.com"
diff --git a/.config/git/ignore b/.config/git/ignore
new file mode 100644
index 0000000..1ea4fc3
--- /dev/null
+++ b/.config/git/ignore
@@ -0,0 +1,6 @@
+/.direnv/
+/.envrc
+/.env
+.vimsession.vim
+tfplan
+plan