From: Junio C Hamano <junkio@cox.net>
Date: Sat, 14 Apr 2007 11:18:46 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~55
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=edb4fd79ec34254fc4a1c35e8834df4c92cb3bfd;p=git.git

Merge branch 'maint'

* maint:
  git-quiltimport complaining yet still working
  config.txt: Fix grammatical error in description of http.noEPSV
  config.txt: Change pserver to server in description of gitcvs.*
  config.txt: Document core.autocrlf
  config.txt: Document gitcvs.allbinary
  Do not default to --no-index when given two directories.
  Use rev-list --reverse in git-rebase.sh
---

edb4fd79ec34254fc4a1c35e8834df4c92cb3bfd