chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Terminology: Change "rewind" to "rewrite" where appropriate
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index d1b4507fab135f63d4dd3ea694c40f1016715c16..bc1fdd646d6dbf3ccee1334db593f5efbb7d8301 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-129,7
+129,8
@@
You should consider using B<prepush> or B<conclude> instead.
=item git-debrebase scrap
Throws away all the work since the branch was last stitched.
=item git-debrebase scrap
Throws away all the work since the branch was last stitched.
-This is done by rewinding you to ffq-prev.
+This is done by resetting you to ffq-prev
+and discarding all working tree changes.
If you are in the middle of a git-rebase, will abort that too.
If you are in the middle of a git-rebase, will abort that too.