summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:54 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:54 +0900
commitc425d361f5bf46d99cd96d7eac3488ebb2e92b60 (patch)
tree9cfdd1b91fc759cb1e561c6302bbd9cfe37245ba /dir.h
parentMerge branch 'sc/pack-redundant' (diff)
parentlog,diff-tree: add --combined-all-paths option (diff)
downloadtgif-c425d361f5bf46d99cd96d7eac3488ebb2e92b60.tar.xz
Merge branch 'en/combined-all-paths'
Output from "diff --cc" did not show the original paths when the merge involved renames. A new option adds the paths in the original trees to the output. * en/combined-all-paths: log,diff-tree: add --combined-all-paths option
Diffstat (limited to 'dir.h')
0 files changed, 0 insertions, 0 deletions