Merge branch 'master' into next
commit703bdcf9e5ad91e669ce4c834d8d17a47c9e720e
authorJunio C Hamano <gitster@pobox.com>
Sat, 8 May 2010 04:39:18 +0000 (7 21:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 8 May 2010 04:39:18 +0000 (7 21:39 -0700)
treef9f89807a843fb84708559e0448675a6f105b638
parentf2086f565f0ac4543b609ea531d30512b5f77a64
parentcfb88e9a8d4926b0011ae2dd67e1f57a98f4b768
Merge branch 'master' into next

* master:
  Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef
  test-lib: some shells do not let $? propagate into an eval
Documentation/config.txt
t/test-lib.sh