Merge branch 'jk/prompt-stash-could-be-packed' into jch
commit2431f121ad2ee64784cfbd1e0426cf11bcbd83e3
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:34:11 +0000 (25 12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:34:11 +0000 (25 12:34 -0700)
tree182a4ac9b68f479913de3fbef7d5bc49b2186a21
parent9383e96367904cab4e31cf9e8adbfcc5d28ed602
parent0fa7f01635aa0356823d5cbb5109f61b0f307e4b
Merge branch 'jk/prompt-stash-could-be-packed' into jch

* jk/prompt-stash-could-be-packed:
  git-prompt: do not look for refs/stash in $GIT_DIR