From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Aug 2011 21:22:26 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.7-rc0~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=50b68aeb392537a730a86349293acf046a778b74;p=git.git

Merge branch 'maint'

* maint:
  Prepare for 1.7.6.1
  am: refresh the index at start and --resolved

Conflicts:
	GIT-VERSION-GEN
	RelNotes
---

50b68aeb392537a730a86349293acf046a778b74