Merge branch 'jk/trailing-slash-in-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:55:13 +0000 (17 15:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:55:14 +0000 (17 15:55 -0700)
Code refactoring.

* jk/trailing-slash-in-pathspec:
  reset: handle submodule with trailing slash
  rm: re-use parse_pathspec's trailing-slash removal

1  2 
builtin/reset.c
t/t7400-submodule-basic.sh

diff --cc builtin/reset.c
Simple merge
Simple merge