mirror of
https://github.com/stevenproctor/dotfiles.git
synced 2026-11-22 15:08:25 -06:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8467be3c43 | ||
|
|
8cade13a72 |
No files matched your search
+17
-2
@@ -15,6 +15,11 @@
|
|||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[alias] ; Command aliases for the git[1] command wrapper
|
[alias] ; Command aliases for the git[1] command wrapper
|
||||||
last = cat-file commit HEAD
|
last = cat-file commit HEAD
|
||||||
|
[diff]
|
||||||
|
algorithm = histogram
|
||||||
|
colorMoved = zebra # plain
|
||||||
|
mnemonicPrefix = true
|
||||||
|
renames = true
|
||||||
[branch]
|
[branch]
|
||||||
autoSetupRebase = always
|
autoSetupRebase = always
|
||||||
[checkout]
|
[checkout]
|
||||||
@@ -23,17 +28,27 @@
|
|||||||
format = ssh
|
format = ssh
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
[fetch]
|
||||||
|
all = true
|
||||||
|
prune = true
|
||||||
|
pruneTags = true
|
||||||
[tag]
|
[tag]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
sort = version:refname
|
||||||
[gpg "ssh"]
|
[gpg "ssh"]
|
||||||
allowedSignersFile = ~/.ssh/allowed_signers
|
allowedSignersFile = ~/.ssh/allowed_signers
|
||||||
|
[help]
|
||||||
|
autocorrect = prompt
|
||||||
[merge]
|
[merge]
|
||||||
|
conflitstyle = zdiff3
|
||||||
ff = only
|
ff = only
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
|
followTags = true
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
autoupdate = true
|
||||||
[remote]
|
[remote]
|
||||||
pushDefault = origin
|
pushDefault = origin
|
||||||
|
|
||||||
|
|||||||
@@ -6,17 +6,17 @@
|
|||||||
|
|
||||||
(fn bufmap [mode from to] (util.noremap mode from to {:local? true}))
|
(fn bufmap [mode from to] (util.noremap mode from to {:local? true}))
|
||||||
|
|
||||||
(fn map-fugitive-keys []
|
; (fn map-fugitive-keys []
|
||||||
(bufmap :n :<leader>gp ":Git pull<CR>")
|
; (bufmap :n :<leader>gp ":Git pull<CR>")
|
||||||
(bufmap :n :<leader>gP ":Git push<CR>")
|
; (bufmap :n :<leader>gP ":Git push<CR>")
|
||||||
(bufmap :n :<leader>gF ":Git push -f<CR>"))
|
; (bufmap :n :<leader>gF ":Git push -f<CR>"))
|
||||||
|
|
||||||
(vim.api.nvim_create_autocmd [:FileType]
|
; (vim.api.nvim_create_autocmd [:FileType]
|
||||||
{:pattern :fugitive :callback map-fugitive-keys})
|
; {:pattern :fugitive :callback map-fugitive-keys})
|
||||||
|
|
||||||
[(tx :tpope/vim-dadbod {})
|
[(tx :tpope/vim-dadbod {})
|
||||||
(tx :tpope/vim-dispatch {})
|
(tx :tpope/vim-dispatch {})
|
||||||
(tx :tpope/vim-fugitive {})
|
; (tx :tpope/vim-fugitive {})
|
||||||
(tx :tpope/vim-git {:lazy false})
|
(tx :tpope/vim-git {:lazy false})
|
||||||
(tx :tpope/vim-pathogen {})
|
(tx :tpope/vim-pathogen {})
|
||||||
(tx :tpope/vim-rails {})
|
(tx :tpope/vim-rails {})
|
||||||
|
|||||||
@@ -3,10 +3,4 @@ local util = require("dotfiles.util")
|
|||||||
local function bufmap(mode, from, to)
|
local function bufmap(mode, from, to)
|
||||||
return util.noremap(mode, from, to, {["local?"] = true})
|
return util.noremap(mode, from, to, {["local?"] = true})
|
||||||
end
|
end
|
||||||
local function map_fugitive_keys()
|
return {{"tpope/vim-dadbod"}, {"tpope/vim-dispatch"}, {"tpope/vim-git", lazy = false}, {"tpope/vim-pathogen"}, {"tpope/vim-rails"}, {"tpope/vim-repeat"}, {"tpope/vim-rhubarb"}, {"tpope/vim-surround"}, {"tpope/vim-unimpaired"}, {"tpope/vim-vinegar", lazy = false}}
|
||||||
bufmap("n", "<leader>gp", ":Git pull<CR>")
|
|
||||||
bufmap("n", "<leader>gP", ":Git push<CR>")
|
|
||||||
return bufmap("n", "<leader>gF", ":Git push -f<CR>")
|
|
||||||
end
|
|
||||||
vim.api.nvim_create_autocmd({"FileType"}, {pattern = "fugitive", callback = map_fugitive_keys})
|
|
||||||
return {{"tpope/vim-dadbod"}, {"tpope/vim-dispatch"}, {"tpope/vim-fugitive"}, {"tpope/vim-git", lazy = false}, {"tpope/vim-pathogen"}, {"tpope/vim-rails"}, {"tpope/vim-repeat"}, {"tpope/vim-rhubarb"}, {"tpope/vim-surround"}, {"tpope/vim-unimpaired"}, {"tpope/vim-vinegar", lazy = false}}
|
|
||||||
Reference in new issue
Block a user