diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:11 -0800 |
| commit | 3ccd681c2ab11522591be8a7a3eddb1a85a43ab0 (patch) | |
| tree | f876b1d4639222cdd7e8e2812807b093ba7b9538 /builtin/merge-recursive.c | |
| parent | Merge branch 'bw/grep-recurse-submodules' (diff) | |
| parent | rm: absorb a submodules git dir before deletion (diff) | |
| download | tgif-3ccd681c2ab11522591be8a7a3eddb1a85a43ab0.tar.xz | |
Merge branch 'sb/submodule-rm-absorb'
"git rm" used to refuse to remove a submodule when it has its own
git repository embedded in its working tree. It learned to move
the repository away to $GIT_DIR/modules/ of the superproject
instead, and allow the submodule to be deleted (as long as there
will be no loss of local modifications, that is).
* sb/submodule-rm-absorb:
rm: absorb a submodules git dir before deletion
submodule: rename and add flags to ok_to_remove_submodule
submodule: modernize ok_to_remove_submodule to use argv_array
submodule.h: add extern keyword to functions
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions