git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Aug 2022 21:42:29 +0000 (14:42 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Aug 2022 21:42:29 +0000 (14:42 -0700)
commit	df3c129e246dda2b43adcd7661d5aff42bbcf2e2
tree	a30be80e7889b4f518cfb2e89a9d737c4d296a38	tree \| snapshot
parent	795ea8776befc95ea2becd8020c7a284677b4161	commit \| diff
parent	565577ed883057d9935cfc56e33be8d4abd9a2fc	commit \| diff

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

merge-ort.c

diff1 |

diff2 |

blob | history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom