commit 95e6f77e2d30d9c6339f365844d53501d9f07daf
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Sat Jan 28 21:47:31 2023 UTC

got.1: editing merged log messages is no longer optional, tweak related wording

commit - 7e710171ff462556367f78cf01da0ca2b0dca532
commit + 95e6f77e2d30d9c6339f365844d53501d9f07daf
blob - 7d0875bded8c1d51f61ead9977882e38be0155c7
blob + 9ca39428e1178142919dfd78df6b0381cda7f8b6
--- got/got.1
+++ got/got.1
@@ -2020,7 +2020,8 @@ When a file changed by
 is committed with
 .Cm got commit ,
 the log messages of relevant merged commits will then appear in the editor,
-where the messages can be further adjusted as needed.
+where the messages must be further adjusted to convey the reasons for
+cherrypicking the changes.
 If all the changes in all files touched by a given commit are discarded,
 e.g. with
 .Cm got revert ,
@@ -2122,7 +2123,8 @@ When a file changed by
 is committed with
 .Cm got commit ,
 the log messages of relevant reverse-merged commits will then appear in
-the editor, where the messages can be further adjusted as needed.
+the editor, where the messages must be further adjusted to convey the
+reasons for backing out the changes.
 If all the changes in all files touched by a given commit are discarded,
 e.g. with
 .Cm got revert ,