Merge 'normalize-win-paths' into HEAD

git-sh-setup.sh

@@ -306,10 +306,8 @@ case $(uname -s) in
 	find () {
 		/usr/bin/find "$@"
 	}
-	# git sees Windows-style pwd
-	pwd () {
-		builtin pwd -W
-	}
+	# Let pwd always return the uniqe real windows path
+	alias pwd='pwd -W'
 	is_absolute_path () {
 		case "$1" in
 		[/\\]* | [A-Za-z]:*)