![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800) | ||
| commit | 2d0d706e5fd08b751a19562974ae0b76d9db03a1 | |
| tree | 8852a1b2770efa8c69dfe85b6d7ece3d8621d53b | tree | snapshot |
| parent | b28a1ce04cdafbd3b470ec43c0f562054bd45d4d | commit | diff |
| parent | 19c6a4f8369f37c0df1fb57008a891eb6a6dc4bb | commit | diff |
Merge branch 'maint'
* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| remote-curl.c | diff1 | | diff2 | | blob | history |