diff --git a/zsh/.config/zsh/aliases b/zsh/.config/zsh/aliases index 728e067..a15a4d9 100644 --- a/zsh/.config/zsh/aliases +++ b/zsh/.config/zsh/aliases @@ -13,7 +13,7 @@ alias ber="bundle exec rake" alias bet="test-rails" alias c="clear" alias cs="toggle-color-mode" -alias cdr="git-root" +alias cdr='cd $(git root)' alias dc="docker-compose-call" alias g="g" # overwrite g alias alias ga="git add" @@ -54,7 +54,7 @@ alias grbi="git rebase --interactive" alias grc="git rm --cached" alias grh="git reset --hard" alias grm="git rm" -alias gst="git-since-last-tag" +alias gst="git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline" alias gack='git log --pretty="%an <%ae>" | sort -u | fzf | xargs -I "{}" git add-trailer "Co-authored-by: {}"' alias gup="git-branch-delete-merged" alias Grep='grep' diff --git a/zsh/.config/zsh/functions b/zsh/.config/zsh/functions index b71dbc4..7debb0c 100644 --- a/zsh/.config/zsh/functions +++ b/zsh/.config/zsh/functions @@ -70,16 +70,6 @@ function git-date-added { fi } -function git-since-last-tag { - git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline -} - -function git-root { - if [[ "$(git rev-parse --is-inside-work-tree)" == "true" ]]; then - cd $(git root) - fi -} - function password-generator { if [ -x "$(command -v openssl)" ]; then password=$( diff --git a/zsh/.config/zsh/prompt b/zsh/.config/zsh/prompt index f806ddb..6e43963 100644 --- a/zsh/.config/zsh/prompt +++ b/zsh/.config/zsh/prompt @@ -3,7 +3,7 @@ precmd() { autoload -Uz vcs_info zstyle ':vcs_info:*' enable git - zstyle ':vcs_info:*:prompt:*' formats "(%b)" + zstyle ':vcs_info:*:prompt:*' formats "[%b]" vcs_info 'prompt' }