diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-26 00:47:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-26 00:47:33 +0100 |
| commit | 6249ce2d1b9b60e7aa630d370e68c87ef6331629 (patch) | |
| tree | fafbfe509b3e197c0b1681d417d2cd1d220d8b84 /mergetools/examdiff | |
| parent | Merge branch 'ab/ambiguous-object-name' (diff) | |
| parent | config: make git_configset_get_string_tmp() private (diff) | |
| download | git-6249ce2d1b9b60e7aa630d370e68c87ef6331629.tar.xz git-6249ce2d1b9b60e7aa630d370e68c87ef6331629.zip | |
Merge branch 'ds/sparse-checkout-requires-per-worktree-config'
"git sparse-checkout" wants to work with per-worktree configuration,
but did not work well in a worktree attached to a bare repository.
* ds/sparse-checkout-requires-per-worktree-config:
config: make git_configset_get_string_tmp() private
worktree: copy sparse-checkout patterns and config on add
sparse-checkout: set worktree-config correctly
config: add repo_config_set_worktree_gently()
worktree: create init_worktree_config()
Documentation: add extensions.worktreeConfig details
Diffstat (limited to 'mergetools/examdiff')
0 files changed, 0 insertions, 0 deletions