X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-gbp.7.pod;h=b7612967098bd86a949290f45935459afa073ad3;hp=c31dfa5956dbfe48e01bea5b8cd2b393eac39e7e;hb=a5a52f9261110b7b983d20b0a6ad04b6e69650ce;hpb=6dbc82e06ae1e6840dfa2ef2cc6b496561e6f333 diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index c31dfa59..b7612967 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -106,11 +106,18 @@ Don't use I<--git-tag>: B will do this for you. To upload: =back This will push your git history to the dgit-repos, but you probably -want to follow it up with a push to alioth. +want to follow it up with a push to salsa. You will need to pass I<--overwrite> 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 +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 +git history.) + =head1 INCORPORATING NMUS B can't yet incorporate NMUs into patches-unapplied gbp