summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:36 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:36 -0800
commit556ccd4dd2943009270b46b9af443a396bff4dfc (patch)
tree9dae6954b6e8d3bfa1eb3050997248d10646fae0 /builtin/am.c
parentMerge branch 'hw/doc-git-dir' (diff)
parentgrep: ignore --recurse-submodules if --no-index is given (diff)
downloadtgif-556ccd4dd2943009270b46b9af443a396bff4dfc.tar.xz
Merge branch 'pb/do-not-recurse-grep-no-index'
"git grep --no-index" should not get affected by the contents of the .gitmodules file but when "--recurse-submodules" is given or the "submodule.recurse" variable is set, it did. Now these settings are ignored in the "--no-index" mode. * pb/do-not-recurse-grep-no-index: grep: ignore --recurse-submodules if --no-index is given
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions