Merge branch 'sb/reset-recurse-submodules'
commit5f074ca7e8ddccb6471e457d7a3f85c1fe00e21a
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:40 +0000 (29 12:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:40 +0000 (29 12:34 +0900)
treebe3c66e879a0278947e30089b376434c6af3a5d8
parent1eb437020a2c098a7c12da4c05082fbea10d98c9
parent35b96d1de8e795aeac8ec281e88e59f2778335e7
Merge branch 'sb/reset-recurse-submodules'

"git reset" learned "--recurse-submodules" option.

* sb/reset-recurse-submodules:
  builtin/reset: add --recurse-submodules switch
  submodule.c: submodule_move_head works with broken submodules
  submodule.c: uninitialized submodules are ignored in recursive commands
  entry.c: submodule recursing: respect force flag correctly
submodule.c
unpack-trees.c