![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Jul 2009 23:57:47 +0000 (16:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Jul 2009 23:57:47 +0000 (16:57 -0700) | ||
| commit | 58b1ef2f0fce75ebf4fbf88e5bdf76a0afaeacce | |
| tree | d88020de86478eeaa883f6626ba6a2f5fdd94e95 | tree | snapshot |
| parent | 4525e8e41a8c0c4246a95097744604ea72198dad | commit | diff |
| parent | 78d3b06e0f5e6aaea001ee8e3e7c8e401dc4b244 | commit | diff |
Merge branch 'maint'
* maint:
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return
* maint:
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return
| refs.c | diff1 | | diff2 | | blob | history |
| unpack-trees.c | diff1 | | diff2 | | blob | history |