![[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) |
* 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
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
Trivial merge