diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-21 15:03:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-21 15:03:17 -0800 |
| commit | 8d2c37320bd01bbce4b88365c160bc4a542bee48 (patch) | |
| tree | d805155422fb863b694eaaeb71967d9667f9e81d /mergetools/tortoisemerge | |
| parent | Merge branch 'en/name-rev-shorter-output' (diff) | |
| parent | blame: enable and test the sparse index (diff) | |
| download | tgif-8d2c37320bd01bbce4b88365c160bc4a542bee48.tar.xz | |
Merge branch 'ld/sparse-diff-blame'
Teach diff and blame to work well with sparse index.
* ld/sparse-diff-blame:
blame: enable and test the sparse index
diff: enable and test the sparse index
diff: replace --staged with --cached in t1092 tests
repo-settings: prepare_repo_settings only in git repos
test-read-cache: set up repo after git directory
commit-graph: return if there is no git directory
git: ensure correct git directory setup with -h
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions