diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:27 +0900 |
| commit | 0821b73063a6d4cfd2f61619b7afe01ce9c6d99e (patch) | |
| tree | 9134195457e8bd6ad1b6b404aba4e6d891446fa7 /fast-import.c | |
| parent | 23057708160db47fe96e6a0b2a547b3f30813e7e (diff) | |
| parent | 76f421259718f5f504558e97dfb99e16c9ceb7c6 (diff) | |
| download | git-0821b73063a6d4cfd2f61619b7afe01ce9c6d99e.tar.gz | |
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
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions