Code

Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 8 Jun 2006 00:27:09 +0000 (17:27 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 8 Jun 2006 00:27:09 +0000 (17:27 -0700)
commitab1b3af7925682e0375667b892e2f7e985effba5
tree3f2cdfe4fc3f15e385cf9ba00f06dc6bddf80943
parentfd4c6cc9d6f6a4a8bd9f4f2825675261f5d91c9c
parent99b41c84a53bf8bb09f06adeb0e3ded503afe706
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
Documentation/git-read-tree.txt