|author||Ian Jackson <firstname.lastname@example.org>||2019-09-05 11:26:16 +0100|
|committer||Ian Jackson <email@example.com>||2020-02-02 16:38:22 +0000|
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 <firstname.lastname@example.org>
Diffstat (limited to 'dgit.1')
1 files changed, 2 insertions, 2 deletions
@@ -792,7 +792,7 @@ The meanings of
understood in the context of Debian are discussed below:
-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.
-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.