From 4be93211fe146a884bdbe517e8b2afacb99da4dd Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 9 May 2014 14:40:25 +0300 Subject: docs: cosmetic reformat of pq manpage sgml source Makes the sgml source more readable. Fix indentation, tab to space, wrap lines. Signed-off-by: Markus Lehtonen --- docs/manpages/gbp-pq.sgml | 155 +++++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 70 deletions(-) (limited to 'docs/manpages/gbp-pq.sgml') diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml index 697916ca..07781893 100644 --- a/docs/manpages/gbp-pq.sgml +++ b/docs/manpages/gbp-pq.sgml @@ -14,7 +14,6 @@ gbp-pq - Manage quilt patches on patch queue branches in git @@ -28,27 +27,28 @@ num - - - - - + + + + + DESCRIPTION - &gbp-pq; helps one to manage quilt patches in Debian packages that are maintained - with &gbp;. This is especially useful with packages using the - 3.0 (quilt) source format. With &gbp-pq; you can maintain the quilt patches - that should be applied to a package on a separate branch called patch-queue - branch. So if your Debian package lives on master - the associated patch-queue branch will be called - patch-queue/master. + &gbp-pq; helps one to manage quilt patches in Debian packages that are + maintained with &gbp;. This is especially useful with packages using the + 3.0 (quilt) source format. With &gbp-pq; you can maintain the quilt patches + that should be applied to a package on a separate branch called patch-queue + branch. So if your Debian package lives on + master the associated patch-queue branch will be + called patch-queue/master. - See for example workflows. + See + for example workflows. @@ -58,65 +58,66 @@ - - Create a patch queue branch from quilt patches in - debian/patches/ that are listed in debian/patches/series. The - patches must apply without fuzz. - + + Create a patch queue branch from quilt patches in debian/patches/ + that are listed in debian/patches/series. The patches must apply + without fuzz. + - - Export the patches on the patch-queue branch associated to the current - branch into a quilt patch series in debian/patches/ and update the - series file. - + + Export the patches on the patch-queue branch associated to the + current branch into a quilt patch series in debian/patches/ and + update the series file. + - - Switch to the patch-queue branch associated to the current branch and - rebase it against the current branch. - + + Switch to the patch-queue branch associated to the current branch and + rebase it against the current branch. + - - Drop (delete) the patch queue associated to the current branch. So if - you're on branch foo this would drop branch - patch-queue/foo. - + + Drop (delete) the patch queue associated to the current branch. So if + you're on branch foo this would drop + branch patch-queue/foo. + - - Add a single patch to the patch-queue similar to using - git-am. Use if you want - the patch to appear in a separate subdir when exporting the patch queue - using . This can be used to separate upstream - pathes from debian specific patches. + + Add a single patch to the patch-queue similar to using + git-am. Use if you want + the patch to appear in a separate subdir when exporting the patch queue + using . This can be used to separate upstream + pathes from debian specific patches. + - - Switch to the patch-queue branch if on the base branch and switch - to base branch if on patch-queue branch. - + + Switch to the patch-queue branch if on the base branch and switch + to base branch if on patch-queue branch. + @@ -126,16 +127,20 @@ - + - verbose execution + + verbose execution + [auto|on|off] - Whether to use colored output. + + Whether to use colored output. + @@ -156,26 +161,31 @@ - Whether the patch files should start with a number or not. + + Whether the patch files should start with a number or not. + topic - Topic to use when importing a single patch + + Topic to use when importing a single patch + NUM - When importing a patch queue fails, go back commit by - commit on the current branch to check if the patch-queue applies - there. Do this at most NUM times. This can - be useful if the patch-queue doesn't apply to the current branch HEAD - anymore, e.g. after importing a new upstream version. - + + When importing a patch queue fails, go back commit by commit on the + current branch to check if the patch-queue applies there. Do this at + most NUM times. This can be useful if the + patch-queue doesn't apply to the current branch HEAD anymore, e.g. + after importing a new upstream version. + @@ -196,28 +206,33 @@ - + + - Ignores the commit, no patch is generated out of it. + + Ignores the commit, no patch is generated out of it. + - topic + topic + - Moves the patch into a subdir called - topic when running - &gbp-pq; export - This allows for some structure below - debian/patches. - + + Moves the patch into a subdir called topic + when running &gbp-pq; export This allows for some + structure below debian/patches. + - topic + topic + - Deprecated: use - topic instead. - + + Deprecated: use + topic instead. + @@ -239,8 +254,8 @@ AUTHOR - - &dhusername; &dhemail; - + + &dhusername; &dhemail; + -- cgit v1.2.3