From: Junio C Hamano <junkio@cox.net>
Date: Sun, 25 Mar 2007 22:07:27 +0000 (-0700)
Subject: Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
X-Git-Tag: v1.5.1-rc2~5^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fd2a75972e90d34bc8d4bebe1d669645557a2192;p=git.git

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

* 'maint' of git://linux-nfs.org/~bfields/git:
  user-manual: introduce "branch" and "branch head" differently
  glossary: clean up cross-references
  glossary: stop generating automatically
  user-manual: Use def_ instead of ref_ for glossary references.
  user-manual.txt: fix a tiny typo.
  user-manual: run xsltproc without --nonet option
---

fd2a75972e90d34bc8d4bebe1d669645557a2192