summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-branches-default
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-07 14:45:10 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-08 10:36:53 -0800
commit274a5c06d525da8c9720ae60454fba6779523c52 (patch)
treea7ad758e0777c7e7fa6486243b8b6edc2de129e1 /t/t5515/refs.br-branches-default
parentmerge: make usage of commit->util more extensible (diff)
downloadtgif-274a5c06d525da8c9720ae60454fba6779523c52.tar.xz
merge: record tag objects without peeling in MERGE_HEAD
Otherwise, "git commit" wouldn't have a way to tell that we were in the middle of merging an annotated or signed tag, not a plain commit, after "git merge" stops to ask the user to resolve conflicts. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.br-branches-default')
0 files changed, 0 insertions, 0 deletions