From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Nov 2007 03:04:27 +0000 (-0800)
Subject: Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
X-Git-Tag: v1.5.3.7~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc3e3ea3c838c1ddf7423401b4cf7a7dba528cff;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: 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
---

dc3e3ea3c838c1ddf7423401b4cf7a7dba528cff