diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:14:49 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:14:49 -0800 |
commit | b1cda70fff238aa8947dc8b527dc4a5f6bd4ede0 (patch) | |
tree | bbb316ed03593eb48779bb5fa60dbce0c5614161 /merge.c | |
parent | fa5f2398e5163f855b0a680b0bf704e2c2e7da24 (diff) | |
parent | 0845122c39c415fa50904ee94c6b60e4e722466b (diff) | |
download | git-b1cda70fff238aa8947dc8b527dc4a5f6bd4ede0.tar.gz |
Merge branch 'dt/refs-backend-pre-vtable'
Code preparation for pluggable ref backends.
* dt/refs-backend-pre-vtable:
refs: break out ref conflict checks
files_log_ref_write: new function
initdb: make safe_create_dir public
refs: split filesystem-based refs code into a new file
refs/refs-internal.h: new header file
refname_is_safe(): improve docstring
pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
copy_msg(): rename to copy_reflog_msg()
verify_refname_available(): new function
verify_refname_available(): rename function
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions