diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2024-04-11 22:36:49 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2024-04-11 23:50:19 +0100 |
| commit | 76370a044df031ffa3db282755dc4599e9e8a0a2 (patch) | |
| tree | af762ff2dfe0756d4daa2b2f604a2691ca3f8e30 /dgit-maint-merge.7.pod | |
| parent | 0fda4ee5b2c61ac390e7cebae503354f7a3af6a3 (diff) | |
dgit --trust-changelog: Recommend in (7) pod manpages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index bfd3758..1cd6491 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -278,9 +278,9 @@ To achieve this, you might need to delete I<debian/source/local-options>. One way to have dgit check your progress is to run B<dgit build-source>. -The first dgit push will require I<--overwrite>. If this is the first +The first dgit push will require I<--trust-changelog>. If this is the 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 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 git history.) @@ -504,7 +504,7 @@ that have been forwarded, "retaining" the ones that haven't. =back Alternatively, you can apply the NMU diff to your repository. The -next push will then require I<--overwrite>. +next push will then require I<--trust-changelog>. =head1 SEE ALSO |