Hello, Reviewed-by: Sean Whitton <spwhit...@spwhitton.name>
(or Acked-by if you prefer)
On Thu 05 Sep 2019 at 11:30AM +01, Ian Jackson wrote:
> Signed-off-by: Ian Jackson <ijack...@chiark.greenend.org.uk>
> ---
> dgit | 2 +-
> dgit.1 | 4 ++--
> git-debrebase.1.pod | 3 ++-
> infra/dgit-repos-server | 2 +-
> 4 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/dgit b/dgit
> index fde8d615..bd594c24 100755
> --- a/dgit
> +++ b/dgit
> @@ -4577,7 +4577,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 2c224294..29f7a22d 100644
> --- a/dgit.1
> +++ b/dgit.1
> @@ -791,7 +791,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.
> @@ -823,7 +823,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 d1b4507f..bc1fdd64 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 f94315af..bbf1aa21 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
--
Sean Whitton
signature.asc
Description: PGP signature
