Commit Diff

Commit:
8bf76af3f358c0ad73a45348c76647955efc78e8
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
got.1: editing merged log messages is no longer optional, tweak related wording
Actions:
Patch | Tree
commit - 555f1fe02608935b41d521bc76d298526e916229
commit + 8bf76af3f358c0ad73a45348c76647955efc78e8
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 ,