Commit Diff

Commit:
ac90e726bb38615ba5126584ccc9642a90e59a69
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
document how something like 'git reset @^' can be achieved Question from florian; One key difference to reset @^ is that the bad commit will remain in history. I suppose a future 'histedit' command could solve that.
Actions:
Patch | Tree
commit - 37c06ea4bc43854ab1212229878ceceb14a26167
commit + ac90e726bb38615ba5126584ccc9642a90e59a69
blob - fbd32c4342eca1984d4d6f19aca67c7da54c351f
blob + c65dd5f2bb5909d507c4997321faa554955b343a
--- got/got.1
+++ got/got.1
@@ -762,6 +762,15 @@ with a pre-defined log message.
 .Pp
 .Dl $ got commit -m 'unify the buffer cache'
 .Pp
+Roll the unified-buffer-cache branch back by one commit, and then
+fetch the rolled-back change into the work tree as a local change
+to be amended and perhaps committed again:
+.Pp
+.Dl $ got backout unified-buffer-cache
+.Dl $ got commit -m 'roll back previous'
+.Dl # now back out the previous backout :-)
+.Dl $ got backout unified-buffer-cache
+.Pp
 Update any work tree checked out from the
 .Dq unified-buffer-cache
 branch to the latest commit on this branch: