diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-13 15:15:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-13 15:15:56 -0700 |
| commit | 1fdfb774aaaa0ee8acb0a1ec9b601e5a2d2999f1 (patch) | |
| tree | 95a0b294812d7081823f08cb08b73941f78c4a89 /builtin/merge.c | |
| parent | 2d498a7c894444fba5cfb0007e6b757afcde63c6 (diff) | |
| parent | 45bde58ef8f521e7deb730ffe90040b58d11af64 (diff) | |
Merge branch 'mt/grep-submodule-textconv'
"git grep --recurse-submodules" takes trees and blobs from the
submodule repository, but the textconv settings when processing a
blob from the submodule is not taken from the submodule repository.
A test is added to demonstrate the issue, without fixing it.
* mt/grep-submodule-textconv:
grep: demonstrate bug with textconv attributes and submodules
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions