diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-28 09:45:02 -0700 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-06 01:27:40 +0000 |
| commit | 1d01e5ebb230a058093afa0058cde2429545fc54 (patch) | |
| tree | 286cb50431b9ceb9abc0084cb29f8a627dc97605 /dgit-maint-merge.7.pod | |
| parent | ee92b10fcb1b04597421fbac76e85daa417aa4c9 (diff) | |
dgit-*(7): --deliberately-not-fast-forward for first dgit push
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index cfbe1c3..22be1c9 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -241,7 +241,12 @@ 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>. +The first dgit push will require I<--overwrite>. If this is the 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 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 SOURCE PACKAGE CONFIGURATION |