summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-12-14 04:09:10 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-15 11:48:22 -0800
commitba2f3f58ac0492b423b0cfc9d6259c8feecfbe7e (patch)
tree3c9bcf38425c294558f47eddffe7ee24256123b5 /builtin/merge-file.c
parentsparse-checkout: enable reapply to take --[no-]{cone,sparse-index} (diff)
downloadtgif-ba2f3f58ac0492b423b0cfc9d6259c8feecfbe7e.tar.xz
git-sparse-checkout.txt: update to document init/set/reapply changes
As noted in the previous commit, using separate `init` and `set` steps with sparse-checkout result in a number of issues. The previous commits made `set` able to handle the work of both commands, and enabled reapply to tweak the {cone,sparse-index} settings. Update the documentation to reflect this, and mark `init` as deprecated. Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Victoria Dye <vdye@github.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions