SZUT-Dominik/Dotfiles
1
0
Fork 0
forked from Snoweuph/Dotfiles
Code Pull requests Activity

Improve git Config

Browse source
This commit is contained in:
Snoweuph 2024-06-02 19:30:27 +02:00
parent 2aacd10240
commit 30fbc2f9c3
Signed by: Snoweuph
GPG key ID: A494330694B208EF
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.config/nvim/lua/plugins/git.lua
View file

@ -19,4 +19,10 @@ return {
vim.keymap.set("n", "<leader>go", ":Git <CR>", { desc = "Open Git" }) vim.keymap.set("n", "<leader>go", ":Git <CR>", { desc = "Open Git" })
end, end,
}, },
{
"moyiz/git-dev.nvim",
lazy = true,
cmd = { "GitDevOpen", "GitDevCleanAll" },
opts = {},
},
} }

6
.gitconfig
View file

@ -8,11 +8,9 @@
autosetupremote = true autosetupremote = true
[help] [help]
autoCorrect = prompt autoCorrect = prompt
[merge]
tool = meld
conflictstyle = zdiff3
[core] [core]
editor = nvim editor = nvim
pager = /usr/share/git-core/contrib/diff-highlight | less
[diff] [diff]
colorMoved = default colorMoved = default
[fetch] [fetch]
@ -21,3 +19,5 @@
[alias] [alias]
adog = log --all --decorate --oneline --graph adog = log --all --decorate --oneline --graph
fl = push --force-with-lease fl = push --force-with-lease
[interactive]
diffFilter = /usr/share/git-core/contrib/diff-highlight