summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-10-30 15:43:40 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-30 15:43:40 +0900
commitd450e56423cfb5fbbdc7679e80605afd5b33b18b (patch)
treed00ddee882bc4037ea9368e835bc1115aff06e16 /ll-merge.h
parentMerge branch 'ch/subtree-build' (diff)
parentrange-diff: allow to diff files regardless of submodule config (diff)
downloadtgif-d450e56423cfb5fbbdc7679e80605afd5b33b18b.tar.xz
Merge branch 'lm/range-diff-submodule-fix'
"git range-diff" did not work well when the compared ranges had changes in submodules and the "--submodule=log" was used. * lm/range-diff-submodule-fix: range-diff: allow to diff files regardless of submodule config
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions