| commit | 8ec959fbcec5f12925eb0a4a60e789a818fdccb9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 21:05:11 +0000 (19 14:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2014 21:05:11 +0000 (19 14:05 -0700) | ||
| tree | 91d4bb1390bf4738123db1567e83565ef9e302cd | treesnapshot (tar.gz zip) |
| parent | 92ea1ac8267a14f4eae55f175ac7ff0aeaaddc89 | commitdiff |
| parent | 0fa7f01635aa0356823d5cbb5109f61b0f307e4b | commitdiff |
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
* jk/prompt-stash-could-be-packed:
git-prompt: do not look for refs/stash in $GIT_DIR