summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2020-09-17 00:44:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-17 09:38:47 -0700
commit308d7a7dc99043c90a9eff6916cad1abe0d473aa (patch)
tree6c66a73ff523ff2d11d9ba063ab30d3f73b08912 /xdiff
parentgit-diff.txt: backtick quote command text (diff)
downloadtgif-308d7a7dc99043c90a9eff6916cad1abe0d473aa.tar.xz
contrib/completion: extract common diff/difftool options
difftool parses its own options and then passes the remaining options onto diff. As a result, they share common command-line options. Instead of duplicating the list, use a shared $__git_diff_difftool_options list. The completion for diff is missing --relative and the completion for difftool is missing --no-index. Add both of these to the common list. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions