diff options
| -rwxr-xr-x | dgit | 2 | ||||
| -rw-r--r-- | dgit.1 | 4 | ||||
| -rw-r--r-- | git-debrebase.1.pod | 3 | ||||
| -rwxr-xr-x | infra/dgit-repos-server | 2 |
4 files changed, 6 insertions, 5 deletions
@@ -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."; } } @@ -792,7 +792,7 @@ The meanings of 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. @@ -824,7 +824,7 @@ never-accepted) versions in the git history of your current push, were 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 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 |