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=34aaafff4f09ab69cf9b8ec55018888ccbe181c6;hp=54407596dc905585d50f7a6d5a875d193f9ed3b3;hb=5b8c24e476a4619fe7b4be9df71858969c128c08;hpb=da9ec7d77f9c3f691d19f87b1117b505b0d58c5b diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 54407596..34aaafff 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -4,8 +4,9 @@ dgit - tutorial for package maintainers of Debian-native packages =head1 INTRODUCTION -This document describes elements of a workflow for maintaining a -native Debian package using B. +This document describes elements of a workflow for using B to +maintain a Debian package that uses one of the native source formats +("1.0" & "3.0 (native)"). =over 4 @@ -77,6 +78,14 @@ so that your history, which will be pushed to the dgit git server, 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>. +instead of C<--overwrite>. +This avoids introducing a new origin commit into +your git history. + =head1 SUBSEQUENT PUSHES =over 4