Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Nov 2007 03:04:27 +0000 (19:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Nov 2007 03:04:27 +0000 (19:04 -0800)
* '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


Trivial merge