| commit | f0605836b7411e700e980122f684d7e788e33a3f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Jan 2018 21:16:39 +0000 (23 13:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Jan 2018 21:16:39 +0000 (23 13:16 -0800) | ||
| tree | 7cb4852215ea74e9fb0cf32bad94a4f2e494ef06 | treesnapshot (tar.gz zip) |
| parent | d470b7ad008c690baee6d83e4f987c49550b8f3e | commitdiff |
| parent | 7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467 | commitdiff |
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
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