summaryrefslogtreecommitdiff
path: root/parse-options.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-27 18:43:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-27 18:43:54 (GMT)
commit14890e916fca7d903332f9fed7fb36fb5715acb1 (patch)
tree3cdc9f55fcaf987a0c3257451961df79c48ee4b6 /parse-options.h
parentc1ab3b8a44149a8dfb8968a958b13ac9e8d9579a (diff)
parent7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467 (diff)
downloadgit-14890e916fca7d903332f9fed7fb36fb5715acb1.zip
git-14890e916fca7d903332f9fed7fb36fb5715acb1.tar.gz
git-14890e916fca7d903332f9fed7fb36fb5715acb1.tar.bz2
Merge branch 'sb/submodule-update-reset-fix' into maint
When resetting the working tree files recursively, the working tree of submodules are now also reset to match. * sb/submodule-update-reset-fix: submodule: submodule_move_head omits old argument in forced case unpack-trees: oneway_merge to update submodules t/lib-submodule-update.sh: fix test ignoring ignored files in submodules t/lib-submodule-update.sh: clarify test
Diffstat (limited to 'parse-options.h')
0 files changed, 0 insertions, 0 deletions