From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2008 03:30:12 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~227
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3791f77c28f233df121da2f83abf7eefc7b49b69;p=git.git

Merge branch 'maint'

* maint:
  sha1_file: link() returns -1 on failure, not errno
  Make git archive respect core.autocrlf when creating zip format archives
  Add new test to demonstrate git archive core.autocrlf inconsistency
  gitweb: avoid warnings for commits without body
  Clarified gitattributes documentation regarding custom hunk header.
  git-svn: fix handling of even funkier branch names
  git-svn: Always create a new RA when calling do_switch for svn://
  git-svn: factor out svnserve test code for later use
  diff/diff-files: do not use --cc too aggressively
---

3791f77c28f233df121da2f83abf7eefc7b49b69