| commit | 8d0d53a8cf2cc0d68e396df155beba8344d7810f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jun 2018 19:50:44 +0000 (13 12:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jun 2018 19:50:45 +0000 (13 12:50 -0700) | ||
| tree | fbcc07c3522d51e88769f67457b92b27b9e34ad4 | treesnapshot (tar.gz zip) |
| parent | fb6ac9e79ae47aa55bb1c8b151afa770abd2a601 | commitdiff |
| parent | 40aac22b43c8f9c4cc3acf625fdec3a24368ed4c | commitdiff |
Merge branch 'sb/submodule-merge-in-merge-recursive'
Finishing touches to a topic that already is in 'master'.
* sb/submodule-merge-in-merge-recursive:
merge-submodule: reduce output verbosity
Finishing touches to a topic that already is in 'master'.
* sb/submodule-merge-in-merge-recursive:
merge-submodule: reduce output verbosity
| merge-recursive.c | diff1 | diff2 | blobhistory |