summaryrefslogtreecommitdiff
path: root/mergetools/bc3
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-01-13 19:10:38 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-16 12:32:45 -0800
commit12434efc1d4a83d768e8b60bfdb711780677a308 (patch)
tree7cb2212005c775450426360fb691e313ddfe0cab /mergetools/bc3
parentMerge branch 'jk/doc-diff-options' (diff)
downloadtgif-12434efc1d4a83d768e8b60bfdb711780677a308.tar.xz
add--interactive: ignore submodule changes except HEAD
For 'add -i' and 'add -p', the only action we can take on a dirty submodule entry is update the index with a new value from its HEAD. The content changes inside (from its own index, untracked files...) do not matter, at least until 'git add -i' learns about launching a new interactive add session inside a submodule. Ignore all other submodules changes except HEAD. This reduces the number of entries the user has to check through in 'git add -i', and the number of 'no' they have to answer to 'git add -p' when dirty submodules are present. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/bc3')
0 files changed, 0 insertions, 0 deletions