summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-06 14:17:51 -0800
committerJunio C Hamano <gitster@pobox.com>2020-01-06 14:17:51 -0800
commitc20d4fd44a9f9016341eb5971a153b5ad542718c (patch)
tree2862b27e9d8670af7c26dc1f444b91ee4de6e1d5 /merge-recursive.c
parenta578ef9e63a2f53ada00beb9d75b23e68061b331 (diff)
parent4fd683b6a35eabd23dd5183da7f654a1e1f00325 (diff)
Merge branch 'ds/sparse-list-in-cone-mode'
"git sparse-checkout list" subcommand learned to give its output in a more concise form when the "cone" mode is in effect. * ds/sparse-list-in-cone-mode: sparse-checkout: document interactions with submodules sparse-checkout: list directories in cone mode
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions