diff --git a/bash/.bash_aliases b/bash/.bash_aliases index a00611d..2fdcb5b 100755 --- a/bash/.bash_aliases +++ b/bash/.bash_aliases @@ -25,7 +25,6 @@ alias cr='composer require' alias csu='composer self-update' alias cu='composer update' alias d='dirs -v | head -10' -alias g=git alias ga='git add' alias gaa='git add --all' alias gapa='git add --patch' diff --git a/bash/.bashrc b/bash/.bashrc index c63cba3..87807c5 100755 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -132,10 +132,17 @@ export PS1="\[$(tput bold)\]\[$(tput setaf 2)\]\u\[$(tput setaf 6)\]@\[$(tput se brc() { vim ~/.bashrc; } tag() { shuf -n 1 ~/taglines.txt; } +g() { + if (( $# == 0 )); then + git status + else + git "$@" + fi +} + export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - [ -f ~/.fzf.bash ] && source ~/.fzf.bash