My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ef87bd 0fa7f01)
Merge branch 'jk/prompt-stash-could-be-packed'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:08 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:08 +0000 (12:54 -0700)
The prompt script checked $GIT_DIR/ref/stash file to see if there
is a stash, which was a no-no.

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


Trivial merge
The core git plumbing