tree 9134195457e8bd6ad1b6b404aba4e6d891446fa7
parent 23057708160db47fe96e6a0b2a547b3f30813e7e
parent 76f421259718f5f504558e97dfb99e16c9ceb7c6
author Junio C Hamano <gitster@pobox.com> 1527684687 +0900
committer Junio C Hamano <gitster@pobox.com> 1527684687 +0900

Merge branch 'sb/submodule-merge-in-merge-recursive'

By code restructuring of submodule merge in merge-recursive,
informational messages from the codepath are now given using the
same mechanism as other output, and honor the merge.verbosity
configuration.  The code also learned to give a few new messages
when a submodule three-way merge resolves cleanly when one side
records a descendant of the commit chosen by the other side.

* sb/submodule-merge-in-merge-recursive:
  merge-recursive: give notice when submodule commit gets fast-forwarded
  merge-recursive: i18n submodule merge output and respect verbosity
  submodule.c: move submodule merging to merge-recursive.c