projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed94cc7 7d79cb6)
Merge git://git.bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Dec 2010 00:03:41 +0000 (16:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Dec 2010 00:03:41 +0000 (16:03 -0800)
* git://git.bogomips.org/git-svn:
  t9143: do not fail when unhandled.log.gz is not created
  git-svn: allow the mergeinfo property to be set


Trivial merge
Git—the stupid content tracker