![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2009 18:22:00 +0000 (11:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2009 18:22:00 +0000 (11:22 -0700) | ||
| commit | 9e4a90ba19033d25dca1eea495b0a8c5f06efbc6 | |
| tree | 5754b630105cf960385bfa374dd1d986fd2e96ff | tree | snapshot |
| parent | 57f6ec029090f64377ec5c0926b6e2e39b0caa4f | commit | diff |
| parent | 3d792161b1c86632d5331bb30d6b7c6b17261f38 | commit | diff |
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3
* tr/maint-1.6.3-add-p-modeonly-fix:
add -p: do not attempt to coalesce mode changes
git add -p: demonstrate failure when staging both mode and hunk
* tr/maint-1.6.3-add-p-modeonly-fix:
add -p: do not attempt to coalesce mode changes
git add -p: demonstrate failure when staging both mode and hunk
| git-add--interactive.perl | diff1 | | diff2 | | blob | history |
| t/t3701-add-interactive.sh | diff1 | | diff2 | | blob | history |