From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Nov 2008 07:15:22 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~103
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aebd173ffa7a4e67447f0157a14abde7767c54e9?hp=aebd173ffa7a4e67447f0157a14abde7767c54e9

Merge branch 'maint'

* maint:
Start 1.6.0.4 cycle
add instructions on how to send patches to the mailing list with Gmail
Documentation/gitattributes: Add subsection header for each attribute
git send-email: avoid leaking directory file descriptors.
send-pack: do not send out single-level refs such as refs/stash
fix overlapping memcpy in normalize_absolute_path
pack-objects: avoid reading uninitalized data
correct cache_entry allocation

Conflicts:
RelNotes
---