summaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 10:43:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 10:43:54 -0800
commit14890e916fca7d903332f9fed7fb36fb5715acb1 (patch)
tree3cdc9f55fcaf987a0c3257451961df79c48ee4b6 /gitk-git
parentMerge branch 'ab/commit-m-with-fixup' into maint (diff)
parentsubmodule: submodule_move_head omits old argument in forced case (diff)
downloadtgif-14890e916fca7d903332f9fed7fb36fb5715acb1.tar.xz
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 'gitk-git')
0 files changed, 0 insertions, 0 deletions