tree 38949f1dc69f9423ea74e99381ce6083d740540a
parent 404fdef22f1084141aeef5781d5a322554fed481
parent f7b47b273ed2c9e9b298c4f5dd02884b46dfbced
author Junio C Hamano <junkio@cox.net> 1179645570 -0700
committer Junio C Hamano <junkio@cox.net> 1179645570 -0700

Merge branch 'maint' to synchronize with 1.5.1.6

* maint:
  GIT 1.5.1.6
  git-svn: don't minimize-url when doing an init that tracks multiple paths
  git-svn: avoid crashing svnserve when creating new directories
  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

Conflicts:

	GIT-VERSION-GEN
	RelNotes