diff options
Diffstat (limited to 'dgit-maint-gbp.7.pod')
| -rw-r--r-- | dgit-maint-gbp.7.pod | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index 1988a31..a27a5fa 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -117,11 +117,11 @@ or if you need to include binaries, This will push your git history to the dgit-repos, but you probably want to follow it up with a push to salsa. -You will need to pass I<--overwrite> if the previous upload was not +You will need to pass I<--trust-changelog> if the previous upload was not performed with dgit. If this is first ever dgit push of the package, consider passing -I<--deliberately-not-fast-forward> instead of I<--overwrite>. This +I<--deliberately-not-fast-forward> instead of I<--trust-changelog>. This avoids introducing a new origin commit into the dgit view of your git history. (This origin commit would represent the most recent non-dgit upload of the package, but this should already be represented in your @@ -134,7 +134,7 @@ should pass the B<--gbp> quilt mode option (see git-debpush(1)). B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp branches. You can just apply the NMU diff the traditional way. The -next upload will require I<--overwrite>. +next upload will require I<--trust-changelog>. =head1 SEE ALSO |