diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:57 +0900 |
| commit | 3be9ac7e56d4bb4ae805543a91de5987e148b661 (patch) | |
| tree | b0ea94ad987a76b159765993d5a70326a4732136 /Documentation/git-merge.txt | |
| parent | Merge branch 'jc/t5601-copy-workaround' into maint (diff) | |
| parent | check-ref-format doc: --branch validates and expands <branch> (diff) | |
| download | tgif-3be9ac7e56d4bb4ae805543a91de5987e148b661.tar.xz | |
Merge branch 'jc/check-ref-format-oor' into maint
"git check-ref-format --branch @{-1}" bit a "BUG()" when run
outside a repository for obvious reasons; clarify the documentation
and make sure we do not even try to expand the at-mark magic in
such a case, but still call the validation logic for branch names.
* jc/check-ref-format-oor:
check-ref-format doc: --branch validates and expands <branch>
check-ref-format --branch: strip refs/heads/ using skip_prefix
check-ref-format --branch: do not expand @{...} outside repository
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions