Merge branch 'master' into dataport

.bash_aliases

@@ -27,6 +27,7 @@ alias gd="git difftool"
 alias gsp="git stage -p"
 # docker
 alias dcu="docker-compose up"
+alias dlogs="docker-compose logs -f"
 alias dcd="docker-compose down"
 alias dcr="docker-compose down && docker-compose up -d"
 # safeguard

.bash_ps1

@@ -8,6 +8,7 @@ BLACK='\[\e[30m\]'
 RESET='\[\e[0m\]'
 ORANGE='\[\e[0;33m\]'
 # git-symbole: * unstaged, + staged, $ stashed, % untracked
+source /usr/lib/git-core/git-sh-prompt
 export GIT_PS1_SHOWUNTRACKEDFILES=1
 export GIT_PS1_SHOWDIRTYSTATE=1
 export GIT_PS1_SHOWSTASHSTATE=1