projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3d2a6dc a1c1d81)
Merge branch 'jk/refs-df-conflict'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:23 +0000 (14:52 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:23 +0000 (14:52 +0900)
commitbab02c6e63958fca62e197053f41affcd50bb00a
treee87f179d6bad89e57dac5e1a2fe8df0380e0dc5dtree | snapshot
parent3d2a6dc9362ec974002f585c30efa51609da0bf4commit | diff
parenta1c1d8170dbc4a108dd2c05d2f93049d49e61328commit | diff
Merge branch 'jk/refs-df-conflict'

An ancient bug that made Git misbehave with creation/renaming of
refs has been fixed.

* jk/refs-df-conflict:
  refs_resolve_ref_unsafe: handle d/f conflicts for writes
  t3308: create a real ref directory/file conflict
Unnamed repository; edit this file 'description' to name the repository.