From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 21:05:11 +0000 (-0700)
Subject: Merge branch 'jk/prompt-stash-could-be-packed' into maint
X-Git-Tag: v2.1.1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ec959fbcec5f12925eb0a4a60e789a818fdccb9?ds=inline;hp=--cc

Merge branch 'jk/prompt-stash-could-be-packed' into maint

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

8ec959fbcec5f12925eb0a4a60e789a818fdccb9