diff options
| author | Claudio Bandera <claudio.bandera@kit.edu> | 2015-09-17 17:52:40 +0200 | 
|---|---|---|
| committer | Claudio Bandera <claudio.bandera@kit.edu> | 2015-09-17 17:52:40 +0200 | 
| commit | f16f1e67a2f2908bfb11fa67f1a5185bc0b2be0f (patch) | |
| tree | e4b1bbfb70317f0cb5247b3416ceeb6621a52be4 /git-radar | |
| parent | 4a7d636bad0d03af22f440bef9bd141bfc0dc309 (diff) | |
| parent | 1f6a8f84946a0cb6936916f47b5a3870fa12a5a6 (diff) | |
| download | git-sonar-f16f1e67a2f2908bfb11fa67f1a5185bc0b2be0f.tar.gz git-sonar-f16f1e67a2f2908bfb11fa67f1a5185bc0b2be0f.zip | |
Merge branch 'master' into feature/stash_indicator
Conflicts:
	prompt.bash
	test
Diffstat (limited to '')
| -rwxr-xr-x | git-radar | 5 | 
1 files changed, 3 insertions, 2 deletions
| @@ -11,6 +11,7 @@ else  fi  dot="$(cd "$(dirname "$([ -L "$0" ] && $READLINK_CMD -f "$0" || echo "$0")")"; pwd)" +args=$@  if [[ -z $@ ]]; then    _git="\033[1;30mgit:(\033[0m" @@ -92,9 +93,9 @@ while [[ $# > 0 ]];do      nohup $dot/fetch.sh >/dev/null 2>&1 &    fi    if [[ "$command" == "--zsh" ]]; then -    $dot/prompt.zsh +    $dot/prompt.zsh $args    fi    if [[ "$command" == "--bash" || "$command" == "--fish" ]]; then -    $dot/prompt.bash +    $dot/prompt.bash $args    fi  done | 
