Merge branch 'lb/status-stash-count'

"git status" learned to optionally give how many stash entries the
user has in its output.

* lb/status-stash-count:
  glossary: define 'stash entry'
  status: add optional stash count information
  stash: update documentation to use 'stash entry'

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc git-stash.sh
Simple merge