rob
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add git aliases, update nvimrc

This commit is contained in:
Rob Watson 2021-10-13 09:56:10 +02:00
parent c3cb3a92a5
commit e872cb658e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitconfig
View File

@ -31,6 +31,7 @@
fixom = !sh -c 'git fetch && git rebase -i --autosquash origin/master' fixom = !sh -c 'git fetch && git rebase -i --autosquash origin/master'
fixup = rebase -i --autosquash fixup = rebase -i --autosquash
l = log l = log
l1 = log --oneline
ll = log --oneline -n 5 ll = log --oneline -n 5
lp = log -p lp = log -p
lm = logme lm = logme
@ -52,6 +53,7 @@
rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u} rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u}
rc = rebase --continue rc = rebase --continue
re = rebase re = rebase
rels = !git rebase $(git branch | fzf)
rh = reset --hard rh = reset --hard
rom = !sh -c 'git fetch && git rebase origin/master' rom = !sh -c 'git fetch && git rebase origin/master'
rr = !sh -c 'git fetch && git reset --hard $(git rb)' rr = !sh -c 'git fetch && git reset --hard $(git rb)'

4
nvimrc
View File

@ -510,7 +510,7 @@ require 'nvim-treesitter.configs'.setup {
enable = true, enable = true,
}, },
indent = { indent = {
enable = true, enable = false,
}, },
textobjects = { textobjects = {
select = { select = {
@ -552,7 +552,7 @@ require 'nvim-treesitter.configs'.setup {
}, },
refactor = { refactor = {
highlight_definitions = { enable = true }, highlight_definitions = { enable = true },
highlight_current_scope = { enable = true }, highlight_current_scope = { enable = false },
smart_rename = { smart_rename = {
enable = true, enable = true,
keymaps = { keymaps = {