From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Nov 2010 19:01:58 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~155
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=774ae9a5ae2a1a2aa7f59a0e4549ecfb342b8eda;p=git.git

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
---

774ae9a5ae2a1a2aa7f59a0e4549ecfb342b8eda