From: Junio C Hamano <junkio@cox.net>
Date: Fri, 27 Oct 2006 09:16:18 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=019298015bb7c826b72f2573047b7221b0921fd3;p=git.git

Merge branch 'maint'

* maint:
  gitweb: Check git base URLs before generating URL from it
  Documentation: add git in /etc/services.
  Documentation: add upload-archive service to git-daemon.
  git-cherry: document limit and add diagram
  diff-format.txt: Correct information about pathnames quoting in patch format
---

019298015bb7c826b72f2573047b7221b0921fd3