X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;fp=dgit.1;h=cdf3af5c188492edad5fd27eaa1091b547dc1bef;hp=9de679dbe10a881353e0bede6d1205dc27f99dcc;hb=60bbeaf9fb39b5d8d73ae3cf309ff29e8b705af3;hpb=209b87ba971701dffcd97a7fd9593cea51f62000 diff --git a/dgit.1 b/dgit.1 index 9de679db..cdf3af5c 100644 --- a/dgit.1 +++ b/dgit.1 @@ -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