diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-11-01 07:38:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-01 07:38:27 -0700 |
| commit | 9dd860c8562917dbbdd595d5f9997b6856dbeb0a (patch) | |
| tree | 144744d5287fbea0e785e3148783a11571acb20e /builtin/merge-ours.c | |
| parent | Git 1.8.5-rc0 (diff) | |
| parent | mv: Fix spurious warning when moving a file in presence of submodules (diff) | |
| download | tgif-9dd860c8562917dbbdd595d5f9997b6856dbeb0a.tar.xz | |
Merge branch 'jl/submodule-mv'
Moving a regular file in a repository with a .gitmodules file was
producing a warning 'Could not find section in .gitmodules where
path=<filename>'.
* jl/submodule-mv:
mv: Fix spurious warning when moving a file in presence of submodules
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions