diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:21 -0700 |
| commit | 93d08928910200969c486328e576057aada6f9dc (patch) | |
| tree | eaac061bd7e2883b175c8ce878599b761966d3e6 /merge-recursive.c | |
| parent | dae477777e5d38780dabb0ebabbfd32fc89c10f6 (diff) | |
| parent | 7edee32985b1363e35e91c7358a9e60f2359fbba (diff) | |
| download | git-93d08928910200969c486328e576057aada6f9dc.tar.gz | |
Merge branch 'dt/submodule-rm-with-stale-cache' into maint
Running "git rm" on a submodule failed unnecessarily when
.gitmodules is only cache-dirty, which has been corrected.
* dt/submodule-rm-with-stale-cache:
git rm submodule: succeed if .gitmodules index stat info is zero
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions