Update gitconfig and zshrc

This commit is contained in:
Rob Watson 2022-03-22 08:10:44 +01:00
parent 60b44032c9
commit a80d384ae8
2 changed files with 3 additions and 2 deletions

View File

@ -33,6 +33,7 @@
drb = !git diff $(git rb) drb = !git diff $(git rb)
ds = diff --staged ds = diff --staged
f = fetch f = fetch
fc = commit --allow-empty -m 'Initial commit'
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

4
zshrc
View File

@ -55,8 +55,7 @@ alias be="bundle exec"
alias berc="bundle exec rails console" alias berc="bundle exec rails console"
alias bers="bundle exec rails server" alias bers="bundle exec rails server"
alias berspec="bundle exec rspec --format=progress --no-profile" alias berspec="bundle exec rspec --format=progress --no-profile"
alias c-="cd -" alias c="clear"
alias c.="cd .."
alias cdg=cdgit alias cdg=cdgit
alias cdgit='cd $(git rev-parse --show-toplevel)' alias cdgit='cd $(git rev-parse --show-toplevel)'
alias clp="tmux kill-pane" alias clp="tmux kill-pane"
@ -78,6 +77,7 @@ alias gst="git status"
alias gt="go test" alias gt="go test"
alias gta="go test ./..." alias gta="go test ./..."
alias ji="jira -b" alias ji="jira -b"
alias k="kubectl"
alias k9="kill -9" alias k9="kill -9"
alias ll="exa -l --group-directories-first --git" alias ll="exa -l --group-directories-first --git"
alias ls="exa --color=auto" alias ls="exa --color=auto"