diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:44 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:44 -0700 |
commit | b10a44e6b69509a09aaa51c8aa6379ab3ca4f3d7 (patch) | |
tree | 552577ae30224442c83e5717eec9dcd7615bdd6b /t/t6431-merge-criscross.sh | |
parent | Merge branch 'en/merge-tests' (diff) | |
parent | diff-lib: use worktree mode in diffs from i-t-a entries (diff) | |
download | tgif-b10a44e6b69509a09aaa51c8aa6379ab3ca4f3d7.tar.xz |
Merge branch 'rp/ita-diff-modefix'
"git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
bit was not showing the mode bits from the working tree.
* rp/ita-diff-modefix:
diff-lib: use worktree mode in diffs from i-t-a entries
Diffstat (limited to 't/t6431-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions