tree dd0bc1c022d89966e4519283faa029d77e8af05a
parent dc431666d3a54a84ac32b6007f020fb13062345b
parent 2dc53617a43fda3df12e51e765fe4043935cfc22
author Junio C Hamano <junkio@cox.net> 1179642359 -0700
committer Junio C Hamano <junkio@cox.net> 1179642359 -0700

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