Skip to main content

Browse the archive

Revision 14890e916fca7d903332f9fed7fb36fb5715acb1 authored by Junio C Hamano on 27 February 2018, 18:43:54 UTC, committed by Junio C Hamano on 27 February 2018, 18:43:54 UTC 
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
2 parent s c1ab3b8 + 7dcc1f4
History
File Mode Size
sha1.c -rw-r--r-- 1.4 KB
sha1.h -rw-r--r-- 579 bytes
sha1ppc.S -rw-r--r-- 7.3 KB
back to top