Andrew's git / gitweb.git / diff
?
Merge branch 'ct/prompt-untracked-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:33:12 +0000 (09:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:33:12 +0000 (09:33 -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 patch | diff1 | diff2 | blob | history
t/t9903-bash-prompt.sh patch | diff1 | diff2 | blob | history
diff --cc contrib/completion/git-prompt.sh
Simple merge
diff --cc t/t9903-bash-prompt.sh
Simple merge