From: Junio C Hamano <junkio@cox.net>
Date: Sat, 19 May 2007 00:13:47 +0000 (-0700)
Subject: Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
X-Git-Tag: v1.5.1.5~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cecb98a9c3ed9271b0974bb6d7edbcf16e8a68f3;p=git.git

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

* 'maint' of git://linux-nfs.org/~bfields/git:
  user-manual: reorganize public git repo discussion
  user-manual: listing commits reachable from some refs not others
  user-manual: introduce git
  user-manual: add a "counting commits" example
  user-manual: move howto/using-topic-branches into manual
  user-manual: move howto/make-dist.txt into user manual
  Documentation: remove howto's now incorporated into manual
  user-manual: move quick-start to an appendix
  glossary: expand and clarify some definitions, prune cross-references
  user-manual: revise birdseye-view chapter
  Add a birdview-on-the-source-code section to the user manual
---

cecb98a9c3ed9271b0974bb6d7edbcf16e8a68f3