From: Junio C Hamano <junkio@cox.net>
Date: Sun, 11 Mar 2007 06:07:26 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ed287ab7fa71528e8de288988d1662eebae64002;p=git.git

Merge branch 'maint'

* maint:
  git.el: Retrieve commit log information from .dotest directory.
  git.el: Avoid appending a signoff line that is already present.
  setup_git_directory_gently: fix off-by-one error
  user-manual: install user manual stylesheet with other web documents
  user-manual: fix rendering of history diagrams
  user-manual: fix missing colon in git-show example
  user-manual: fix inconsistent use of pull and merge
  user-manual: fix inconsistent example
  glossary: fix overoptimistic automatic linking of defined terms
  Documentation: s/seperator/separator/
  Adjust reflog filemode in shared repository
---

ed287ab7fa71528e8de288988d1662eebae64002