diff options
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 51b6a69..ddf37aa 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -344,12 +344,16 @@ dgit(1). If any command fails, dgit will provide a carefully-worded error message explaining what you should do. If it's not clear, file a bug against dgit. Remember to pass I<--new> for the first upload. -As an alternative to B<dgit build> and friends, you can use a tool -like gitpkg(1). This works because like dgit, gitpkg(1) enforces that -HEAD has exactly the contents of the source package. gitpkg(1) is -highly configurable, and one dgit user reports using it to produce and -test multiple source packages, from different branches corresponding -to each of the current Debian suites. +If you want to upload with git-debpush(1), for the first upload you +should pass the B<--quilt=smash> quilt mode option (see +git-debpush(1)). + +As another alternative to B<dgit build> and friends, you can use a +tool like gitpkg(1). This works because like dgit, gitpkg(1) enforces +that HEAD has exactly the contents of the source package. gitpkg(1) +is highly configurable, and one dgit user reports using it to produce +and test multiple source packages, from different branches +corresponding to each of the current Debian suites. If you want to skip dgit's checks while iterating on a problem with the package build (for example, you don't want to commit your changes |