summaryrefslogtreecommitdiff
path: root/builtin/hash-object.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:01 -0700
commit5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5 (patch)
treea0eaaf3110e43b2a4aec5f7023fbf62a655418de /builtin/hash-object.c
parentMerge branch 'pw/sequence-rerere-autoupdate' (diff)
parentgrep: recurse in-process using 'struct repository' (diff)
downloadtgif-5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5.tar.xz
Merge branch 'bw/grep-recurse-submodules'
"git grep --recurse-submodules" has been reworked to give a more consistent output across submodule boundary (and do its thing without having to fork a separate process). * bw/grep-recurse-submodules: grep: recurse in-process using 'struct repository' submodule: merge repo_read_gitmodules and gitmodules_config submodule: check for unmerged .gitmodules outside of config parsing submodule: check for unstaged .gitmodules outside of config parsing submodule: remove fetch.recursesubmodules from submodule-config parsing submodule: remove submodule.fetchjobs from submodule-config parsing config: add config_from_gitmodules cache.h: add GITMODULES_FILE macro repository: have the_repository use the_index repo_read_index: don't discard the index
Diffstat (limited to 'builtin/hash-object.c')
0 files changed, 0 insertions, 0 deletions