projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 755253a 3d79216)
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Aug 2009 11:59:32 +0000 (04:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Aug 2009 11:59:32 +0000 (04:59 -0700)
commit7c565082b5a861199b903a1f78ad80f0231779ae
tree12ac1d0941d536e0bf59532e04f2c61e2b56b20btree | snapshot
parent755253a91d0596a28cd1d3a76ad1a94c21dbda50commit | diff
parent3d792161b1c86632d5331bb30d6b7c6b17261f38commit | diff
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into next

* 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
Unnamed repository; edit this file 'description' to name the repository.