diff options
Diffstat (limited to 'dgit.1')
| -rw-r--r-- | dgit.1 | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -680,6 +680,8 @@ unless you know what you are doing. This option is useful if you are the maintainer, and you have incorporated NMU changes into your own git workflow in a way that doesn't make your branch a fast forward from the NMU. +It can also be useful when there was an upload made without dgit +since the most recent upload made with dgit. This option is also usually necessary the first time a package is pushed with dgit push @@ -791,11 +793,16 @@ 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. + When pushing to Debian, -use this when you are making a renewed upload of an entirely +use this only when you are making a renewed upload of an entirely new source package whose previous version was not accepted for release -from NEW because of problems with copyright or redistributibility. +from NEW because of problems with copyright or redistributibility; +or, exceptionally, for the very first upload with dgit. When split view is in operation, this also prevents the construction by dgit of a pseudomerge @@ -818,7 +825,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 |