Merge branch 'ct/prompt-untracked-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:18 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:18 +0000 (12:54 -0700)
The prompt script (in contrib/) did not show the untracked sign
when working in a subdirectory without any untracked files.

* ct/prompt-untracked-fix:
git prompt: use toplevel to find untracked files

1  2 
contrib/completion/git-prompt.sh
t/t9903-bash-prompt.sh
Simple merge
Simple merge