From 80489b3ec6643c06d525ec39a7d72135286ba62c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 Jul 2018 02:19:05 +0100 Subject: [PATCH] dgit(7): Mention git-debrebase and gbp pq alongside git-dpm in the comment about handling patch stacks. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ dgit.7 | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 62fb2bc7..dcff9e6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ dgit (5.7~) unstable; urgency=medium * dgit checkout: new subcommand. Closes:#878443. Bugfixes: + * dgit(7): Mention git-debrebase and gbp pq alongside git-dpm, + in the comment about handling patch stacks. * dgit update-vcs-git: Honour --package properly. -- diff --git a/dgit.7 b/dgit.7 index 0d43ee0d..b623d8cf 100644 --- a/dgit.7 +++ b/dgit.7 @@ -298,7 +298,8 @@ If you are a quilt user you need to know that dgit's git trees are `patches applied packaging branches' and do not contain the .pc directory (which is used by quilt to record which patches are applied). If you want to manipulate the patch stack you probably want -to be looking at tools like git-dpm. +to be looking at tools like +git-debrebase, gbp pq, or git-dpm. .SS quilt fixup error messages When dgit's quilt fixup fails, it prints messages like this: -- 2.30.2