diff options
Diffstat (limited to 'dgit-maint-native.7.pod')
| -rw-r--r-- | dgit-maint-native.7.pod | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 4e8b795..e08ab15 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -58,7 +58,7 @@ Simply prepare your git tree in the usual way, and then: =over 4 - % dgit -wgf --overwrite push-source + % dgit -wgf --trust-changelog push-source =back @@ -68,7 +68,7 @@ You may use B<dgit pbuilder> or B<dgit cowbuilder> instead of B<dgit sbuild>; see dgit(1) for the syntax of those subcommands. -The --overwrite option tells dgit that you are expecting +The --trust-changelog option tells dgit that you are expecting that your git history is not a descendant of the history which dgit synthesised from the previous non-dgit uploads. @@ -85,7 +85,7 @@ Alternatively, if this was the first ever dgit push of the package, you can avoid this merge commit by passing C<--deliberately-not-fast-forward> -instead of C<--overwrite>. +instead of C<--trust-changelog>. This avoids introducing a new origin commit into your git history. @@ -120,7 +120,7 @@ you can do this: =back If you do not merge the NMU into your own git history, -the next push will then require I<--overwrite>. +the next push will then require I<--trust-changelog>. =head1 SEE ALSO |