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

update gitconfig and nvimrc

This commit is contained in:
Rob Watson 2023-06-30 05:12:15 +02:00
parent adcab9d77f
commit 6d02791a65
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitconfig
View File

@ -26,6 +26,7 @@
cp = cherry-pick cp = cherry-pick
cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn" cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn"
cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn" cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn"
cp4 = "!fn() { git cherry-pick $1~4..$1; }; fn"
cpls = !git cp $(git ls) cpls = !git cp $(git ls)
d = diff d = diff
dls = !git diff $(git branch | fzf) dls = !git diff $(git branch | fzf)
@ -43,7 +44,9 @@
lm = logme lm = logme
logme = !sh -c 'git log --author=\"$(git config --get user.name)\"' logme = !sh -c 'git log --author=\"$(git config --get user.name)\"'
ls = !git branch --format '%(refname:short)' | fzf ls = !git branch --format '%(refname:short)' | fzf
mls = !git merge $(git ls)
mr = !git merge $(git rb) mr = !git merge $(git rb)
mrb = mr
mt = merge -s recursive -X theirs mt = merge -s recursive -X theirs
nb = checkout -b nb = checkout -b
nuke1 = reset --hard HEAD^ nuke1 = reset --hard HEAD^
@ -83,6 +86,7 @@
sshp = stash show -p sshp = stash show -p
undo = reset --soft HEAD^ undo = reset --soft HEAD^
wip = !git add . && git commit -m 'WIP' wip = !git add . && git commit -m 'WIP'
wt = worktree
[user] [user]
email = rob@netflux.io email = rob@netflux.io
name = Rob Watson name = Rob Watson

2
nvimrc
View File

@ -536,7 +536,7 @@ require 'nvim-treesitter.configs'.setup {
ensure_installed = "all", ensure_installed = "all",
highlight = { highlight = {
enable = true, enable = true,
disable = {"vim"}, disable = {"vim", "swift"},
additional_vim_regex_highlighting = true, additional_vim_regex_highlighting = true,
}, },
incremental_selection = { incremental_selection = {