From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 3 Dec 2012 22:23:51 +0000 (-0600)
Subject: Merge branch 'devel' of https://github.com/salsifis/msysgit
X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/947ccf6973a5be4795b3c411fe3727abad51d75d

Merge branch 'devel' of https://github.com/salsifis/msysgit

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Conflicts:
	etc/profile
---

947ccf6973a5be4795b3c411fe3727abad51d75d
diff --cc etc/profile
index da6a4649,c406ad29..59263889
--- a/etc/profile
+++ b/etc/profile
@@@ -150,17 -152,23 +150,24 @@@ esa
  
  
  . /git/contrib/completion/git-completion.bash
 +[ -r /git/contrib/completion/git-prompt.sh ] && . /git/contrib/completion/git-prompt.sh
+ 
+ # non-printable characters must be enclosed inside \[ and \]
+ PS1='\[\033[0m\]'              # VT100 compat: reset all colors
+ PS1="$PS1"'$MSYSTEM:\w'        # e.g. MINGW32:/path/to/cwd
+ PS1="$PS1"'\[\007\]'           # Ascii character BEL
+ PS1="$PS1"'\n'                 # new line
+ PS1="$PS1"'\[\033[32m\]'       # change color
+ PS1="$PS1"'\u@\h '             # user@host<space>
+ PS1="$PS1"'\[\033[33m\]'       # change color
+ PS1="$PS1"'\w'                 # current working directory
  if test -z "$WINELOADERNOEXEC"
  then
- 	PS1='\[\033]0;$MSYSTEM:\w\007
- \033[32m\]\u@\h \[\033[33m\w$(__git_ps1)\033[0m\]
- $ '
- else
- 	PS1='\[\033]0;$MSYSTEM:\w\007
- \033[32m\]\u@\h \[\033[33m\w\033[0m\]
- $ '
+ 	PS1="$PS1"'$(__git_ps1)'   # bash function
  fi
+ PS1="$PS1"'\[\033[0m\]'        # change color
+ PS1="$PS1"'\n'                 # new line
+ PS1="$PS1"'$ '                 # prompt: always $
  
  # set default options for 'less'
  export LESS=-FRSX