From: Junio C Hamano <junkio@cox.net>
Date: Sun, 20 May 2007 07:19:30 +0000 (-0700)
Subject: Merge branch 'maint' to synchronize with 1.5.1.6
X-Git-Tag: v1.5.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/03f6db0ec058ca1d34672a3100293c3bf56c3b6b?hp=03f6db0ec058ca1d34672a3100293c3bf56c3b6b

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
---