![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Oct 2010 21:16:28 +0000 (14:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Oct 2010 21:16:28 +0000 (14:16 -0700) | ||
| commit | 329be7730532291c77109721f24f39d596b95511 | |
| tree | 5e2128f082c95e9ff8d118883abe26830b87ba6a | tree | snapshot |
| parent | 53ea256ab9071d54b4f09772408e442ad43bc73a | commit | diff |
| parent | 1bb28d87e1d8897db662f48455d369860758fbdd | commit | diff |
Merge branch 'master' into next
* master:
{cvs,svn}import: use the new 'git read-tree --empty'
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors
* master:
{cvs,svn}import: use the new 'git read-tree --empty'
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors