Merge branch 'maint'
commit86eff8c512b96ce3ee0ae5818edfa035b98cdf08
authorJunio C Hamano <junkio@cox.net>
Sat, 2 Jun 2007 19:05:08 +0000 (2 12:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 2 Jun 2007 19:05:08 +0000 (2 12:05 -0700)
tree0d562bf2e10356ca6b085787dd726c430e680436
parent302665473cfe233516cc4c29a1a0359153e5506d
parent996e2d6ea2626f55a59e70ac7305a02ce0171814
Merge branch 'maint'

* maint:
  Use =20 when rfc2047 encoding spaces.
  Create a new manpage for the gitignore format, and reference it elsewhere
  Documentation: robustify asciidoc GIT_VERSION replacement
Documentation/config.txt