From: Junio C Hamano <junkio@cox.net>
Date: Thu, 8 Jun 2006 00:27:09 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab1b3af7925682e0375667b892e2f7e985effba5;p=git.git

Merge branch 'master' into next

* master:
  Documentation: git aliases
  git-cvsserver asciidoc formatting tweaks
  config.txt grammar, typo, and asciidoc fixes
  Documentation: git-ls-tree (typofix)
  Document git-ls-tree --fullname
  Document git aliases support
  make clean: remove dist-doc targets.
  Misc doc improvements
  Documentation: add missing docs make check-docs found.
  Some doc typo fixes
  Off-by-one error in get_path_prefix(), found by Valgrind
  gitk: Re-read the descendent/ancestor tag & head info on update
---

ab1b3af7925682e0375667b892e2f7e985effba5