Merge branch 'nd/add-i-ignore-submodules'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:41 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:41 +0000 (13:16 -0800)
commite7e80778e705ea3f9332c634781d6d0f8c6eab64
treeaaada0f9cb2029976fb2a877e50462862cabf278
parent897de845e62ddccba5310057b64d568bc3d4e182
parent12434efc1d4a83d768e8b60bfdb711780677a308
Merge branch 'nd/add-i-ignore-submodules'

"git add -p" was taught to ignore local changes to submodules as
they do not interfere with the partial addition of regular changes
anyway.

* nd/add-i-ignore-submodules:
  add--interactive: ignore submodule changes except HEAD