From: Junio C Hamano <junkio@cox.net>
Date: Sun, 25 Mar 2007 22:08:11 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2603fa5fb358ee7834bc9e1a2e391f69d8fce815;p=git.git

Merge branch 'maint'

* maint:
  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
---

2603fa5fb358ee7834bc9e1a2e391f69d8fce815