Merge branch 'maint'
commited287ab7fa71528e8de288988d1662eebae64002
authorJunio C Hamano <junkio@cox.net>
Sun, 11 Mar 2007 06:07:26 +0000 (10 22:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Mar 2007 06:07:26 +0000 (10 22:07 -0800)
treefa8ab5768bfce68c5923b674c13d514942a3954c
parentbd1fc628b8d456bdaea3e10d435cf1e98bc5d8a8
parent60fa08ed617dd148a9843bfdef2dfecf2ef60123
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
Documentation/git-fast-import.txt
Documentation/user-manual.txt
refs.c
setup.c