Update gitconfig and vimrc
This commit is contained in:
parent
cc99b3cecc
commit
5a87f5bfde
|
@ -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
|
||||
|
|
|
@ -67,3 +67,4 @@ iabbrev loge log.Error().Msg("
|
|||
iabbrev logf log.Fatal().Msg("
|
||||
iabbrev rn return nil
|
||||
iabbrev fnc func() {<cr><cr>}<esc>kcc
|
||||
iabbrev ctxcc ctx context.Context
|
||||
|
|
1
zshrc
1
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"
|
||||
|
|
Loading…
Reference in New Issue