![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -0700) | ||
| commit | bb0c8065f167a29e22f22e6e1355096395475430 | |
| tree | 5760c1a4aa507c3c3fb6b4d76256b630ab1138ec | tree | snapshot |
| parent | d9b9784f572a71b2f4ea0f8772b0d586ea0f848f | commit | diff |
| parent | 9e4a90ba19033d25dca1eea495b0a8c5f06efbc6 | commit | diff |
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
* maint-1.6.3:
add -p: do not attempt to coalesce mode changes
git add -p: demonstrate failure when staging both mode and hunk