Commit Diff

Commit:
6685e2e8b2b4865d3b68e933360528e6382eb28e
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
Apply 'histedit -e' wording tweak from James Cook, thanks!
Actions:
Patch | Tree
commit - e96d39bf87c8025d794e9c5c5bfcbbca58c216ac
commit + 6685e2e8b2b4865d3b68e933360528e6382eb28e
blob - 9aaf3dc10775366350e21fa4420df92be29a108c
blob + 7e97b133703610f71105c0f7c18f05b29286506f
--- got/got.1
+++ got/got.1
@@ -2504,8 +2504,8 @@ character are ignored entirely.
 The available histedit script commands are as follows:
 .Bl -column YXZ pick-commit
 .It Cm pick Ar commit Ta Use the specified commit as it is.
-.It Cm edit Ar commit Ta Use the specified commit but once changes have been
-merged into the work tree interrupt the histedit operation for amending.
+.It Cm edit Ar commit Ta Apply the changes from the specified commit, but
+then interrupt the histedit operation for amending, without creating a commit.
 While the histedit operation is interrupted arbitrary files may be edited,
 and commands which manipulate the work tree can be used freely.
 The