Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submo...

* jt/add-submodule-odb-clean-up:
  revision: remove "submodule" from opt struct
  repository: support unabsorbed in repo_submodule_init
  submodule: remove unnecessary unabsorbed fallback

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc revision.h
Simple merge

diff --cc submodule.c
Simple merge