summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-04 02:19:05 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-04 02:19:06 +0100
commit80489b3ec6643c06d525ec39a7d72135286ba62c (patch)
tree38349fa03f4b127926870f3c52dd6f4482876dcd
parent950f90c24d818782a88c612cb24845b8086a281f (diff)
dgit(7): Mention git-debrebase and gbp pq alongside git-dpm
in the comment about handling patch stacks. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog2
-rw-r--r--dgit.73
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 62fb2bc..dcff9e6 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 0d43ee0..b623d8c 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: