![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Nov 2010 19:01:58 +0000 (11:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Nov 2010 19:01:58 +0000 (11:01 -0800) | ||
| commit | 774ae9a5ae2a1a2aa7f59a0e4549ecfb342b8eda | |
| tree | 14dbbcf9c8aba57248d1f8b773721f4c4665f979 | tree | snapshot |
| parent | d103166d7e9f1756878c3a913d6ffded69ea2f51 | commit | diff |
| parent | d6b634fafdb5570d9c25d5176d3d32fe0b22530d | commit | diff |
Merge branch 'master' into next
* master:
tests: use test_cmp instead of piping to diff(1)
t7004-tag.sh: re-arrange git tag comment for clarity
rebase -X: do not clobber strategy
Documentation: document show -s
dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout
* master:
tests: use test_cmp instead of piping to diff(1)
t7004-tag.sh: re-arrange git tag comment for clarity
rebase -X: do not clobber strategy
Documentation: document show -s
dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout