Merge branch 'jl/submodule-rm'
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2012 20:52:30 +0000 (29 12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2012 20:52:30 +0000 (29 12:52 -0800)
Finishing touches to "git rm $submodule" that removes the working
tree of a submodule.

* jl/submodule-rm:
  Teach rm to remove submodules when given with a trailing '/'

1  2 
builtin/rm.c

diff --cc builtin/rm.c
Simple merge