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

Update gitconfig and vimrc

This commit is contained in:
Rob Watson 2021-05-31 10:29:55 +02:00
parent cc99b3cecc
commit 5a87f5bfde
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitconfig
View File

@ -25,6 +25,7 @@
fixom = rebase -i --autosquash origin/master fixom = rebase -i --autosquash origin/master
fixup = rebase -i --autosquash fixup = rebase -i --autosquash
l = log l = log
ll = log --oneline -n 5
ls = !git branch --format '%(refname:short)' | fzf ls = !git branch --format '%(refname:short)' | fzf
mr = !git merge $(git rb) mr = !git merge $(git rb)
mt = merge -s recursive -X theirs mt = merge -s recursive -X theirs
@ -40,6 +41,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
rh = reset --hard
rom = rebase origin/master rom = rebase origin/master
rr = !git reset --hard $(git rb) rr = !git reset --hard $(git rb)
s = status s = status

1
vim/after/ftplugin/go.vim
View File

@ -67,3 +67,4 @@ iabbrev loge log.Error().Msg("
iabbrev logf log.Fatal().Msg(" iabbrev logf log.Fatal().Msg("
iabbrev rn return nil iabbrev rn return nil
iabbrev fnc func() {<cr><cr>}<esc>kcc iabbrev fnc func() {<cr><cr>}<esc>kcc
iabbrev ctxcc ctx context.Context

1
zshrc
View File

@ -87,6 +87,7 @@ alias sk="setkeys"
alias ssc="sudo systemctl" alias ssc="sudo systemctl"
alias sysc="systemctl" alias sysc="systemctl"
alias rggo="rg -g '*\.go' -g '!vendor/'" 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 rggt="rg -g '*\_test.go' -g '!vendor/'"
alias tm="tmux attach" alias tm="tmux attach"
alias tmd="tmux new -s default -c $HOME || tmux attach -t default" alias tmd="tmux new -s default -c $HOME || tmux attach -t default"