summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
209b87b)
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 <ijackson@chiark.greenend.org.uk>
" of the archive's version.\n".
"To overwrite the archive's contents,".
" pass --overwrite[=VERSION].\n".
" 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.";
}
}
" use --deliberately-not-fast-forward.";
}
}
understood in the context of Debian are discussed below:
.TP
.BR --deliberately-not-fast-forward
understood in the context of Debian are discussed below:
.TP
.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.
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.
rejected by ftpmaster for copyright or redistributability reasons.
.TP
.BR --deliberately-fresh-repo
rejected by ftpmaster for copyright or redistributability reasons.
.TP
.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.
.TP
throw away the existing repo. Not relevant when pushing to Debian,
as the Debian server will do this automatically when necessary.
.TP
=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.
# current head for the suite (there must be at least one).
#
# This prevents any tag implying a NOFFCHECK push being
# 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
#
# The possibility of an earlier ff-only push being replayed is
# eliminated as follows: the tag from such a push would still