Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
commitdc3e3ea3c838c1ddf7423401b4cf7a7dba528cff
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Nov 2007 03:04:27 +0000 (25 19:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Nov 2007 03:04:27 +0000 (25 19:04 -0800)
tree5ab3f9de080e71b50234eae432caba430514f269
parentf0c4881facabc0aa76f4b51871bd70c45effb508
parent1cdade2c4cb27f648a98d326ef3db523b6afafa7
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

* 'maint' of git://linux-nfs.org/~bfields/git:
  user-manual: recovering from corruption
  user-manual: clarify language about "modifying" old commits
  user-manual: failed push to public repository
  user-manual: define "branch" and "working tree" at start