diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2021-09-24 15:39:08 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-28 10:31:02 -0700 |
commit | 0299a69694fcf486a0880439bb4dacfafe3ffc38 (patch) | |
tree | 2e719f647be34a55ec6c560202b2a4c5e5ffc735 /Documentation/config/am.txt | |
parent | add: skip tracked paths outside sparse-checkout cone (diff) | |
download | tgif-0299a69694fcf486a0880439bb4dacfafe3ffc38.tar.xz |
add: implement the --sparse option
We previously modified 'git add' to refuse updating index entries
outside of the sparse-checkout cone. This is justified to prevent users
from accidentally getting into a confusing state when Git removes those
files from the working tree at some later point.
Unfortunately, this caused some workflows that were previously possible
to become impossible, especially around merge conflicts outside of the
sparse-checkout cone. These were documented in tests within t1092.
We now re-enable these workflows using a new '--sparse' option to 'git
add'. This allows users to signal "Yes, I do know what I'm doing with
these files," and accept the consequences of the files leaving the
worktree later.
We delay updating the advice message until implementing a similar option
in 'git rm' and 'git mv'.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/am.txt')
0 files changed, 0 insertions, 0 deletions