Merge branch 'jc/complete-diff-tracked-paths' into jch

"git -C <dir> diff fi<TAB>" did not complete dir/file, which has been corrected. * jc/complete-diff-tracked-paths: completion: complete tracked paths for git diff