From: Junio C Hamano <junkio@cox.net>
Date: Sun, 20 May 2007 06:25:59 +0000 (-0700)
Subject: Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
X-Git-Tag: v1.5.1.6~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2be2e267aaae6f7b77a820591463b7888b30cbc3;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: Add section on ignoring files
  user-manual: finding commits referencing given file content
  user-manual: discourage shared repository
  tutorial: revise index introduction
  tutorials: add user-manual links
---

2be2e267aaae6f7b77a820591463b7888b30cbc3