diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-11 14:52:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-11 14:52:23 +0900 |
| commit | bab02c6e63958fca62e197053f41affcd50bb00a (patch) | |
| tree | e87f179d6bad89e57dac5e1a2fe8df0380e0dc5d /builtin/commit.c | |
| parent | Merge branch 'rs/rs-mailmap' (diff) | |
| parent | refs_resolve_ref_unsafe: handle d/f conflicts for writes (diff) | |
| download | git-bab02c6e63958fca62e197053f41affcd50bb00a.tar.gz git-bab02c6e63958fca62e197053f41affcd50bb00a.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions