From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2009 19:05:57 +0000 (-0700)
Subject: Merge branch 'maint-1.6.3' into maint
X-Git-Tag: v1.6.4.2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb0c8065f167a29e22f22e6e1355096395475430;p=git.git

Merge branch 'maint-1.6.3' into maint

* maint-1.6.3:
  add -p: do not attempt to coalesce mode changes
  git add -p: demonstrate failure when staging both mode and hunk
---

bb0c8065f167a29e22f22e6e1355096395475430