summaryrefslogtreecommitdiff
path: root/parse-options.h
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-01-05 20:03:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-05 20:35:35 (GMT)
commit7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467 (patch)
tree34cf3bc69af82512426e5b7322d2ed6d87d33f18 /parse-options.h
parentad17312e1170715a15651b3185dae9ebc6b6b8ef (diff)
downloadgit-7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467.zip
git-7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467.tar.gz
git-7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467.tar.bz2
submodule: submodule_move_head omits old argument in forced case
When using hard reset or forced checkout with the option to recurse into submodules, the submodules need to be reset, too. It turns out that we need to omit the duplicate old argument to read-tree in all forced cases to omit the 2 way merge and use the more assertive behavior of reading the specific new tree into the index and updating the working tree. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.h')
0 files changed, 0 insertions, 0 deletions