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

Fix git branch autocompletion when using bash aliases

Browse Source
This commit is contained in:
Michael Campagnaro 2017-07-17 12:07:02 -04:00
parent 3cb02a1281
commit 15dce64546
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
windows/bashrc
View File

@ -19,10 +19,23 @@ export TMP=/tmp
export TEMP=/tmp export TEMP=/tmp
export TMPDIR=/tmp export TMPDIR=/tmp
# Customize the shell prompt
parse_git_branch() { parse_git_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
} }
export PS1='\[\033[0;32m\]\[\033[0m\033[0;32m\]\u\[\033[0;36m\] @ \w\[\033[33m\]\n$(parse_git_branch)\[\033[0;32m\]\[\033[0m\033[0;32m\] \$\[\033[0m\033[0;32m\]\[\033[0m\] ' export PS1='\[\033[0;32m\]\[\033[0m\033[0;32m\]\u\[\033[0;36m\] @ \w\[\033[33m\]\n$(parse_git_branch)\[\033[0;32m\]\[\033[0m\033[0;32m\] \$\[\033[0m\033[0;32m\]\[\033[0m\] '
# Git autocompletion
# Git bash file can be downloaded with: `curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash -o ~/.git-completion.bash`
if [ -f ~/.git-completion.bash ]; then
. ~/.git-completion.bash
# Git autocompletion fixes for bash aliases
__git_complete g __git_main
__git_complete gco _git_checkout
__git_complete gm _git_merge
__git_complete gmff _git_merge
__git_complete gmnff _git_merge
fi
cd ~ cd ~