diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-25 14:42:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-25 14:42:29 -0700 |
| commit | df3c129e246dda2b43adcd7661d5aff42bbcf2e2 (patch) | |
| tree | a30be80e7889b4f518cfb2e89a9d737c4d296a38 /commit-graph.c | |
| parent | The fourteenth batch (diff) | |
| parent | merge-ort: provide helpful submodule update message when possible (diff) | |
| download | git-df3c129e246dda2b43adcd7661d5aff42bbcf2e2.tar.gz git-df3c129e246dda2b43adcd7661d5aff42bbcf2e2.zip | |
Merge branch 'en/submodule-merge-messages-fixes'
Further update the help messages given while merging submodules.
* en/submodule-merge-messages-fixes:
merge-ort: provide helpful submodule update message when possible
merge-ort: avoid surprise with new sub_flag variable
merge-ort: remove translator lego in new "submodule conflict suggestion"
submodule merge: update conflict error message
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions