From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 18:43:54 +0000 (-0800)
Subject: Merge branch 'sb/submodule-update-reset-fix' into maint
X-Git-Tag: v2.16.3~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14890e916fca7d903332f9fed7fb36fb5715acb1?hp=14890e916fca7d903332f9fed7fb36fb5715acb1

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
---