From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Mar 2011 23:59:30 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~66
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b2f6eab4027beaaa7415e70dad269bdc7cc27722;p=git.git

Merge branch 'maint'

* maint:
  Prepare draft release notes to 1.7.4.2
  gitweb: highlight: replace tabs with spaces
  make_absolute_path: return the input path if it points to our buffer
  valgrind: ignore SSE-based strlen invalid reads
  diff --submodule: split into bite-sized pieces
  cherry: split off function to print output lines
  branch: split off function that writes tracking info and commit subject
  standardize brace placement in struct definitions
  compat: make gcc bswap an inline function
  enums: omit trailing comma for portability

Conflicts:
	RelNotes
---

b2f6eab4027beaaa7415e70dad269bdc7cc27722