diff options
| author | Mike Vink <59492084+ivi-vink@users.noreply.github.com> | 2025-01-22 14:19:59 +0100 |
|---|---|---|
| committer | Mike Vink <59492084+ivi-vink@users.noreply.github.com> | 2025-01-22 14:19:59 +0100 |
| commit | 3000da50139ff3b044c5742140bc1ede8e3f4ad6 (patch) | |
| tree | c20dc0d4851ef2c9163392b9c5441b51a174b85d /mut/git | |
| parent | 6043502305e3d5ccc6c537d4ed085d8b2454c5c8 (diff) | |
fix git and nushell
Diffstat (limited to 'mut/git')
| -rw-r--r-- | mut/git/config | 25 | ||||
| -rw-r--r-- | mut/git/github | 2 | ||||
| -rw-r--r-- | mut/git/ignore | 6 |
3 files changed, 33 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" diff --git a/mut/git/github b/mut/git/github new file mode 100644 index 0000000..421194d --- /dev/null +++ b/mut/git/github @@ -0,0 +1,2 @@ +[user] + email = "59492084+ivi-vink@users.noreply.github.com" diff --git a/mut/git/ignore b/mut/git/ignore new file mode 100644 index 0000000..1ea4fc3 --- /dev/null +++ b/mut/git/ignore @@ -0,0 +1,6 @@ +/.direnv/ +/.envrc +/.env +.vimsession.vim +tfplan +plan |