Merge branch 'maint'

* maint:
  Document -<n> for git-format-patch
  glossary: add 'reflog'
  diff --no-index: fix --name-status with added files
  Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long

diff --cc Documentation/git-format-patch.txt
Simple merge

diff --cc diff.c
Simple merge

diff --cc sha1_file.c
Simple merge

diff --cc t/t4013-diff-various.sh
Simple merge