]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 795ea87 565577e)
Merge branch 'en/submodule-merge-messages-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2022 21:42:29 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2022 21:42:29 +0000 (14:42 -0700)
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

1  2 
merge-ort.c patch | diff1 | diff2 | blob | history

diff --cc merge-ort.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.