X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-native.7.pod;h=792be1053df9a863685c8eeb93a4b0911977310d;hp=34aaafff4f09ab69cf9b8ec55018888ccbe181c6;hb=3193ca2bad512d2563797eca11ceb9d707a65004;hpb=1d01e5ebb230a058093afa0058cde2429545fc54 diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 34aaafff..792be105 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -65,6 +65,10 @@ Simply prepare your git tree in the usual way, and then: (Do not make any tags yourself: dgit push will do that.) +You may use B or B +instead of B; +see dgit(1) for the syntax of those subcommands. + The --overwrite option tells dgit that you are expecting that your git history is not a descendant of the history which dgit synthesised from the previous @@ -81,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.