Merge branch 'master' into next
commitc8d5142c2ff43a16b8002bd312570e6280bac72a
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Mar 2013 21:18:45 +0000 (1 13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Mar 2013 21:18:45 +0000 (1 13:18 -0800)
treed536dc52afee02ec886db27cf6acf3ad48c6d15a
parentee7ae0e791c0cfde29201fbeb0ef3e11ac76773d
parent06d67b876642822828596b0b38cda2f61d438335
Merge branch 'master' into next

* master:
  Git 1.8.1.5
  Make !pattern in .gitattributes non-fatal
  Documentation/githooks: Fix linkgit
Documentation/githooks.txt