From bee6f2e6f73394c340d37d22c3636fc5ffb4bf97 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 12 Oct 2016 18:20:34 +0100 Subject: [PATCH 1/1] dgit.1: Minor clarifications Signed-off-by: Ian Jackson --- dgit.1 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dgit.1 b/dgit.1 index 677da279..42973a40 100644 --- a/dgit.1 +++ b/dgit.1 @@ -470,9 +470,9 @@ that any changes to upstream .gitignore files are represented as patches in debian/patches). With --quilt=gbp|dpm|unapplied, -dgit quilt-fixup and dgit-push will automatically -convert your git branch into the right form, -and dgit push will push the +dgit push (or precursors like quilt-fixup and build) will automatically +generate a conversion of your git branch into the right form. +dgit push will push the dgit-compatible form (the .BR "dgit view" ) to the dgit git server. @@ -484,13 +484,15 @@ dgit push will create a tag for the maintainer view, and the dgit tag .BI archive/debian/ version for the dgit view. +dgit quilt-fixup will merely do some checks, +and cache the maintainer view. .B If you have a branch like this it is essential to specify the appropriate --quilt= option! This is because it is not always possible to tell: a patches-unapplied -git branch of a package with one patch, for example, looks just the -same as a patches-applied branch where the user has used git revert to +git branch of a package with one patch, for example, looks very like +a patches-applied branch where the user has used git revert to undo the patch, expecting to actually revert it. -If you fail to specify the right \-\-quilt option, +However, if you fail to specify the right \-\-quilt option, and you aren't too lucky, dgit will notice the problem and stop, with a useful hint. .TP @@ -558,7 +560,7 @@ Specifying --git is not effective for some lower-level read-only git operations performed by dgit, and also not when git is invoked by another program run by dgit. -See notes above regarding ssh and dgit. +See notes below regarding ssh and dgit. NB that --gpg:option is not supported (because debsign does not have that facility). -- 2.30.2