diff --git a/gitconfig b/gitconfig index e36fed2..0c9c4e8 100644 --- a/gitconfig +++ b/gitconfig @@ -25,6 +25,7 @@ fixom = rebase -i --autosquash origin/master fixup = rebase -i --autosquash l = log + ll = log --oneline -n 5 ls = !git branch --format '%(refname:short)' | fzf mr = !git merge $(git rb) mt = merge -s recursive -X theirs @@ -40,6 +41,7 @@ rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u} rc = rebase --continue re = rebase + rh = reset --hard rom = rebase origin/master rr = !git reset --hard $(git rb) s = status diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim index 1252ead..c479be4 100644 --- a/vim/after/ftplugin/go.vim +++ b/vim/after/ftplugin/go.vim @@ -67,3 +67,4 @@ iabbrev loge log.Error().Msg(" iabbrev logf log.Fatal().Msg(" iabbrev rn return nil iabbrev fnc func() {}kcc +iabbrev ctxcc ctx context.Context diff --git a/zshrc b/zshrc index c3b7d04..e0aadbe 100644 --- a/zshrc +++ b/zshrc @@ -87,6 +87,7 @@ alias sk="setkeys" alias ssc="sudo systemctl" alias sysc="systemctl" alias rggo="rg -g '*\.go' -g '!vendor/'" +alias rggs="rg -g '*\.go' -g '!vendor/' -g '!*_test.go'" alias rggt="rg -g '*\_test.go' -g '!vendor/'" alias tm="tmux attach" alias tmd="tmux new -s default -c $HOME || tmux attach -t default"