diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:39 -0800 |
| commit | f0605836b7411e700e980122f684d7e788e33a3f (patch) | |
| tree | 7cb4852215ea74e9fb0cf32bad94a4f2e494ef06 /mergesort.c | |
| parent | Merge branch 'bw/oidmap-autoinit' (diff) | |
| parent | submodule: submodule_move_head omits old argument in forced case (diff) | |
| download | tgif-f0605836b7411e700e980122f684d7e788e33a3f.tar.xz | |
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
Diffstat (limited to 'mergesort.c')
0 files changed, 0 insertions, 0 deletions