]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b28a1ce 19c6a4f)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800)
commit2d0d706e5fd08b751a19562974ae0b76d9db03a1
tree8852a1b2770efa8c69dfe85b6d7ece3d8621d53btree | snapshot
parentb28a1ce04cdafbd3b470ec43c0f562054bd45d4dcommit | diff
parent19c6a4f8369f37c0df1fb57008a891eb6a6dc4bbcommit | diff
Merge branch 'maint'

* 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
Unnamed repository; edit this file 'description' to name the repository.