Merge branch 'maint'
commit88bbda08d7b9503862a8fb8846d78c67825e5e3d
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 00:10:28 +0000 (16 17:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 00:10:28 +0000 (16 17:10 -0700)
tree1eb8c68123ee29f1eb1ade9065041d8009ab95dc
parentdd33927ccdb92205988ba98bb2bb7df47529cd6d
parent473a189b92b70295157d20fe229d44824061c79f
Merge branch 'maint'

* maint:
  Start preparing 1.5.6.4 release notes
  git fetch-pack: do not complain about "no common commits" in an empty repo
  rebase-i: keep old parents when preserving merges
  t7600-merge: Use test_expect_failure to test option parsing
  Fix buffer overflow in prepare_attr_stack
  Fix buffer overflow in git diff
  Fix buffer overflow in git-grep
  git-cvsserver: fix call to nonexistant cleanupWorkDir()
  Documentation/git-cherry-pick.txt et al.: Fix misleading -n description

Conflicts:
RelNotes
Documentation/git-cherry-pick.txt
Documentation/git-revert.txt
diff.c
git-rebase--interactive.sh
revision.c
t/t7600-merge.sh