OSDN Git Service

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)
"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


Trivial merge