| commit | 09ba7b2d9fc9142a2195082dd0e74c8161b6b744 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Aug 2009 06:32:58 +0000 (18 23:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Aug 2009 06:32:58 +0000 (18 23:32 -0700) | ||
| tree | b1a787a2fe289c10c7cf70e27239fc02999a159f | treesnapshot (tar.gz zip) |
| parent | 91e50b2c0a3bfa818454590fcc6a1ef70c3c58d0 | commitdiff |
| parent | 3d792161b1c86632d5331bb30d6b7c6b17261f38 | commitdiff |
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
* 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 | blobhistory |
| t/t3701-add-interactive.sh | diff1 | diff2 | blobhistory |