Merge branch 'jc/name-branch' into next
commita39b9abdc152e00f114a47512b641d91c7d22ade
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 05:50:19 +0000 (1 22:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 05:50:19 +0000 (1 22:50 -0700)
treeb081a30e459cb5a50f57be80a68a9795df153deb
parentc6a4faebfa5ae82db30588fccc56b132861c92a1
parent3e262b95c50991de12cc5e180b72256561606a19
Merge branch 'jc/name-branch' into next

* jc/name-branch:
  Don't permit ref/branch names to end with ".lock"
  check_ref_format(): tighten refname rules

Conflicts:
Documentation/git-check-ref-format.txt
Documentation/git-check-ref-format.txt
builtin-branch.c
refs.c