tree acffdd6c89fa7042aba4a276dfe495853d687704
parent a5c2d26a044af3899669b010a5b85801a8c2b6a7
parent eda694491933ac5f209892f3e284b648bb0185a0
author Junio C Hamano <junkio@cox.net> 1179533627 -0700
committer Junio C Hamano <junkio@cox.net> 1179533627 -0700

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