X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-native.7.pod;fp=dgit-maint-native.7.pod;h=792be1053df9a863685c8eeb93a4b0911977310d;hp=ac57728cea1d8f573cdeafbcc9bb70aa6d2fd052;hb=9e94228f893936a65dea1a05758e523dc7e7d22f;hpb=89ddee481cef0bbe0e8f094be134625a8dccf3d2 diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index ac57728c..792be105 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -85,7 +85,7 @@ is fast forward from the dgit archive view. 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>. +passing C<--deliberately-not-fast-forward> instead of C<--overwrite>. This avoids introducing a new origin commit into your git history.