diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:43:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:43:54 -0800 |
| commit | 14890e916fca7d903332f9fed7fb36fb5715acb1 (patch) | |
| tree | 3cdc9f55fcaf987a0c3257451961df79c48ee4b6 /builtin/notes.c | |
| parent | Merge branch 'ab/commit-m-with-fixup' into maint (diff) | |
| parent | submodule: submodule_move_head omits old argument in forced case (diff) | |
| download | git-14890e916fca7d903332f9fed7fb36fb5715acb1.tar.gz git-14890e916fca7d903332f9fed7fb36fb5715acb1.zip | |
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 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions