![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Apr 2009 07:43:44 +0000 (00:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Apr 2009 07:43:44 +0000 (00:43 -0700) | ||
| commit | fbdc05661d9b732d06c47ccb3d5836d0d1b563e5 | |
| tree | b5e7e00ca449758d6244a382a27e9b967286787a | tree | snapshot |
| parent | 03a39a91842cf745e5fc27dbd6485aad44d839a4 | commit | diff |
| parent | 3e262b95c50991de12cc5e180b72256561606a19 | commit | diff |
Merge branch 'jc/name-branch'
* jc/name-branch:
Don't permit ref/branch names to end with ".lock"
check_ref_format(): tighten refname rules
strbuf_check_branch_ref(): a helper to check a refname for a branch
Fix branch -m @{-1} newname
check-ref-format --branch: give Porcelain a way to grok branch shorthand
strbuf_branchname(): a wrapper for branch name shorthands
Rename interpret/substitute nth_last_branch functions
Conflicts:
Documentation/git-check-ref-format.txt
* jc/name-branch:
Don't permit ref/branch names to end with ".lock"
check_ref_format(): tighten refname rules
strbuf_check_branch_ref(): a helper to check a refname for a branch
Fix branch -m @{-1} newname
check-ref-format --branch: give Porcelain a way to grok branch shorthand
strbuf_branchname(): a wrapper for branch name shorthands
Rename interpret/substitute nth_last_branch functions
Conflicts:
Documentation/git-check-ref-format.txt
| Documentation/git-check-ref-format.txt | diff1 | | diff2 | | blob | history |
| builtin-branch.c | diff1 | | diff2 | | blob | history |
| builtin-checkout.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| refs.c | diff1 | | diff2 | | blob | history |