summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-11-16 00:10:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-16 00:15:50 -0800
commit4b4e26d21f77d9e90125ca1c8f48592a9cd6f543 (patch)
tree447f21f17a4292809577edface34daccc967f737 /git-merge-octopus.sh
parentbuiltin-ls-files.c: coding style fix. (diff)
downloadtgif-4b4e26d21f77d9e90125ca1c8f48592a9cd6f543.tar.xz
Teach ls-files --with-tree=<tree> to work with options other than -c
Originally --with-tree=<tree> was designed for the sole purpose of checking if a given pathspec makes sense as a parameter to git-commit using it in conjunction with --error-unmatch. It had logic to avoid showing the same entry (one came from the original index, another from the overlayed tree) twice so that it works with -c (i.e. "show-cached"), but otherwise it was not designed to work with the flags such as -m, -d, etc. This teaches the same logic to cover the codepath for -m and -d. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions