From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Jan 2018 21:16:39 +0000 (-0800)
Subject: Merge branch 'sb/submodule-update-reset-fix'
X-Git-Tag: v2.17.0-rc0~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0605836b7411e700e980122f684d7e788e33a3f;p=git

Merge branch 'sb/submodule-update-reset-fix'

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

f0605836b7411e700e980122f684d7e788e33a3f