]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa03131 8947fdd)
Merge branch 'jk/maint-add-p-delete-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:37:50 +0000 (22:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:37:50 +0000 (22:37 -0800)
* jk/maint-add-p-delete-fix:
  add-interactive: fix deletion of non-empty files

1  2 
git-add--interactive.perl patch | diff1 | diff2 | blob | history
t/t3701-add-interactive.sh patch | diff1 | diff2 | blob | history

diff --cc git-add--interactive.perl
Simple merge
diff --cc t/t3701-add-interactive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.