summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-01 07:38:26 -0700
committerJunio C Hamano <gitster@pobox.com>2013-11-01 07:38:27 -0700
commit9dd860c8562917dbbdd595d5f9997b6856dbeb0a (patch)
tree144744d5287fbea0e785e3148783a11571acb20e /builtin/merge-recursive.c
parent42817b96b1b80b56fd5a4d5e0d6239524b1832a3 (diff)
parent04c1ee576accad4d0a04f168b86992aba0a6727d (diff)
downloadgit-9dd860c8562917dbbdd595d5f9997b6856dbeb0a.tar.gz
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-recursive.c')
0 files changed, 0 insertions, 0 deletions