Changes since v1: - Generate a more user friendly unique ID - Added tests for "git rm" error cases (thanks Jonathan Nieder) Peter Collingbourne (9): Generate unique ID for submodules created using "git submodule add" Implement "git mv" for submodules git rm: test failure behaviour for multiple removals git rm: display a warning for every unremovable file git rm: collect file modes Add a mode parameter to the remove_path function git rm: do not abort due to an initialised submodule git submodule: infrastructure for reading .gitmodules files in arbitrary locations git rm: remove submodule entries from .gitmodules Documentation/git-mv.txt | 7 ++- Documentation/git-rm.txt | 5 ++- Documentation/git-submodule.txt | 8 +++- builtin/apply.c | 2 +- builtin/mv.c | 33 +++++++++++-- builtin/rm.c | 45 ++++++++++++++--- dir.c | 4 +- dir.h | 2 +- git-submodule.sh | 98 ++++++++++++++++++++++++++++++++++-- merge-recursive.c | 27 ++++++---- t/t3600-rm.sh | 69 +++++++++++++++++++++++++ t/t7403-submodule-sync.sh | 2 +- t/t7405-submodule-merge.sh | 13 +++++ t/t7406-submodule-update.sh | 6 +- t/t7407-submodule-foreach.sh | 14 +++--- t/t7409-submodule-mv-rm.sh | 105 +++++++++++++++++++++++++++++++++++++++ 16 files changed, 395 insertions(+), 45 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html