summaryrefslogtreecommitdiff
path: root/Documentation/cmd-list.perl
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-03-14 14:46:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-16 14:07:16 -0700
commita7bc845a9ae2bc4c58566e6744dd3cec0f805244 (patch)
tree4b9f61256b14ea2c7138548f3aad84c3e8fab8b4 /Documentation/cmd-list.perl
parentunpack-trees: pass old oid to verify_clean_submodule (diff)
downloadtgif-a7bc845a9ae2bc4c58566e6744dd3cec0f805244.tar.xz
unpack-trees: check if we can perform the operation for submodules
In a later patch we'll support submodule entries to be in sync with the tree in working tree changing commands, such as checkout or read-tree. When a new submodule entry changes in the tree, we need to check if there are conflicts (directory/file conflicts) for the tree. Add this check for submodules to be performed before the working tree is touched. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/cmd-list.perl')
0 files changed, 0 insertions, 0 deletions