summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-04-04 10:56:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-04-04 10:56:21 -0700
commit1041d58b4d9c587b2b6c76c3dfb14fbe78ccf196 (patch)
treef6203832102655e0e5de47976186bb4a250b75dd /mergetools
parentMerge branch 'ab/reflog-parse-options' (diff)
parentls-tree: split up "fast path" callbacks (diff)
downloadtgif-1041d58b4d9c587b2b6c76c3dfb14fbe78ccf196.tar.xz
Merge branch 'tl/ls-tree-oid-only'
"git ls-tree" learns "--oid-only" option, similar to "--name-only", and more generalized "--format" option. * tl/ls-tree-oid-only: ls-tree: split up "fast path" callbacks ls-tree: detect and error on --name-only --name-status ls-tree: support --object-only option for "git-ls-tree" ls-tree: introduce "--format" option cocci: allow padding with `strbuf_addf()` ls-tree: introduce struct "show_tree_data" ls-tree: slightly refactor `show_tree()` ls-tree: fix "--name-only" and "--long" combined use bug ls-tree: simplify nesting if/else logic in "show_tree()" ls-tree: rename "retval" to "recurse" in "show_tree()" ls-tree: use "size_t", not "int" for "struct strbuf"'s "len" ls-tree: use "enum object_type", not {blob,tree,commit}_type ls-tree: add missing braces to "else" arms ls-tree: remove commented-out code ls-tree tests: add tests for --name-status
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions