Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Jul 2007 05:56:59 +0000 (22:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Jul 2007 05:56:59 +0000 (22:56 -0700)
commite2b1accc59ab5d682d71fd801ebe959c3e871488
treefe7ff753798566ed54d2ac8af556ccc58cb4f471
parentf6b78c6eb626d477b252d39ef2801d4670675a2b
parented5f07a6fdc5653e24a5bd6c216d12bc878496bd
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
Documentation/git-format-patch.txt
diff.c
sha1_file.c
t/t4013-diff-various.sh