git Flog+delta

This commit is contained in:
Henrik Bakken
2023-03-11 00:04:08 +01:00
parent 304ec2968e
commit 3580857057
2 changed files with 16 additions and 17 deletions
+12 -1
View File
@@ -11,7 +11,7 @@
cpld = loadcheckpoint required = true cpld = loadcheckpoint required = true
[core] [core]
filemode = false filemode = false
pager = diff-so-fancy | less --tabs=4 -RFX pager = delta
autorcrlf = true autorcrlf = true
editor = nvim editor = nvim
[user] [user]
@@ -21,3 +21,14 @@
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
light = false
line-numbers = true
side-by-side = true
[merge]
conflictstyle = diff3
[diff]
colorMoved = default
+4 -16
View File
@@ -91,7 +91,7 @@ local cmd = vim.cmd
vim.api.nvim_command [[augroup MYAU]] vim.api.nvim_command [[augroup MYAU]]
vim.api.nvim_command [[autocmd!]] vim.api.nvim_command [[autocmd!]]
vim.api.nvim_command [[autocmd BufWritePost * %s/\s\+$//e]] vim.api.nvim_command [[autocmd BufWritePost * %s/\s\+$//e]]
vim.api.nvim_command [[autocmd BufWritePost *.py silent! execute ':Black']] vim.api.nvim_command [[autocmd BufWritePre *.py execute ':Black']]
vim.api.nvim_command [[autocmd FileType *.py setlocal indentkeys-=<:>]] vim.api.nvim_command [[autocmd FileType *.py setlocal indentkeys-=<:>]]
vim.api.nvim_command [[autocmd BufReadPost quickfix nmap <buffer> <cr> <cr>]] vim.api.nvim_command [[autocmd BufReadPost quickfix nmap <buffer> <cr> <cr>]]
vim.api vim.api
@@ -209,24 +209,12 @@ require("packer").startup {
end end
} }
-- tig
use { use {
"iberianpig/tig-explorer.vim", "rbong/vim-flog",
requires = {"rbgrouleff/bclose.vim"},
config = function() config = function()
vim.tig_explorer_keymap_edit_e = 'e'
vim.tig_explorer_keymap_edit = '<C-o>'
vim.tig_explorer_keymap_tabedit = '<C-t>'
vim.tig_explorer_keymap_split = '<C-s>'
vim.tig_explorer_keymap_vsplit = '<C-v>'
vim.tig_explorer_keymap_commit_edit = '<ESC>o'
vim.tig_explorer_keymap_commit_tabedit = '<ESC>t'
vim.tig_explorer_keymap_commit_split = '<ESC>s'
vim.tig_explorer_keymap_commit_vsplit = '<ESC>v'
vim.g.tig_explorer_use_builtin_term = 0
local map = vim.api.nvim_set_keymap local map = vim.api.nvim_set_keymap
map("", "<leader>gg", ":TigOpenProjectRootDir<cr><cr>", {}) map("", "<leader>gg", ":Flog<cr>", {})
map("", "<leader>gG", ":TigOpenCurrentFile<cr>", {}) map("", "<leader>gG", ":Flogsplit<cr>", {})
end end
} }