summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-18 23:32:58 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-18 23:32:58 -0700
commit09ba7b2d9fc9142a2195082dd0e74c8161b6b744 (patch)
treeb1a787a2fe289c10c7cf70e27239fc02999a159f /git-difftool--helper.sh
parent91e50b2c0a3bfa818454590fcc6a1ef70c3c58d0 (diff)
parent3d792161b1c86632d5331bb30d6b7c6b17261f38 (diff)
downloadgit-09ba7b2d9fc9142a2195082dd0e74c8161b6b744.tar.gz
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
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions