diff options
authorIan Jackson <>2019-09-05 11:26:16 +0100
committerIan Jackson <>2020-02-02 16:38:22 +0000
commit60bbeaf9fb39b5d8d73ae3cf309ff29e8b705af3 (patch)
parent209b87ba971701dffcd97a7fd9593cea51f62000 (diff)
Terminology: Change "rewind" to "rewrite" where appropriate
In #928473, Colin Watson writes: > the use of "rewind" as a synonym for "non-fast-forwarding", while > somewhat common in git terminology, is unfortunate. The terms seem > to be borrowed from video playback systems, where "rewind" is often > just the exact opposite of "fast-forward", and so when I see > "rewinding history" in a few places in dgit(1) my initial > interpretation is that it must mean "updating a ref to point to an > ancestor of the commit that it previously pointed to", whereas I > think dgit(1) means "any push that isn't a fast-forward". I don't > know if I'm the only one for whom it has that connotation. This makes sense. So, I am changing uses of "rewind" which do not mean precisely going back to an ancestor. I think we can often use the word "rewrite" for the more general case, but there are some places where another wording is better. Signed-off-by: Ian Jackson <>
4 files changed, 6 insertions, 5 deletions
diff --git a/dgit b/dgit
index 716cecf..b035e10 100755
--- a/dgit
+++ b/dgit
@@ -4604,7 +4604,7 @@ END
" of the archive's version.\n".
"To overwrite the archive's contents,".
" pass --overwrite[=VERSION].\n".
- "To rewind history, if permitted by the archive,".
+ "To rewrite history, if permitted by the archive,".
" use --deliberately-not-fast-forward.";
diff --git a/dgit.1 b/dgit.1
index 9de679d..cdf3af5 100644
--- a/dgit.1
+++ b/dgit.1
@@ -792,7 +792,7 @@ The meanings of
understood in the context of Debian are discussed below:
.BR --deliberately-not-fast-forward
-Declare that you are deliberately rewinding history.
+Declare that you are deliberately rewriting history.
This could be because your branch is not fast forward from the
dgit server history,
or not fast forward from a locally-synthesised dsc import.
@@ -824,7 +824,7 @@ never-accepted) versions in the git history of your current push, were
rejected by ftpmaster for copyright or redistributability reasons.
.BR --deliberately-fresh-repo
-Declare that you are deliberately rewinding history and want to
+Declare that you are deliberately rewriting history and want to
throw away the existing repo. Not relevant when pushing to Debian,
as the Debian server will do this automatically when necessary.
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index d1b4507..bc1fdd6 100644
--- 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.
-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.
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index f94315a..bbf1aa2 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -784,7 +784,7 @@ sub checktagnoreplay () {
# current head for the suite (there must be at least one).
# This prevents any tag implying a NOFFCHECK push being
- # replayed to rewind from a different head.
+ # replayed to overwrite a different head.
# The possibility of an earlier ff-only push being replayed is
# eliminated as follows: the tag from such a push would still