path: root/debian/changelog
diff options
authorIan Jackson <>2018-08-19 23:25:48 +0100
committerIan Jackson <>2018-08-19 23:43:08 +0100
commit8f28dfa084b6d63e385d7fe538214eee2f90ea9e (patch)
tree6af6b90b3c12ff02ab8a2c718e4f0e09249a3885 /debian/changelog
parent3367a5049a0032c13023bdb930c0c80bc326c49c (diff)
git-debrebase: Snag on repeated conversions
If debrebase-last says we are ahead of some previous gdr work, it is carrying on is unlikely to be helpful. It would only be sensible if the package is vacillating between branch formats, and this is reflected and visible in the branch history. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'debian/changelog')
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 614a576..3ac55a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dgit (6.7~) unstable; urgency=medium
* git-debrebase: convert-from-gbp: Improve messages. Closes:#906641.
* git-debrebase: Highly experimental merge resolution support,
enabled only with special command line option.
+ * git-debrebase: Check in convert-from-* whether ffq-prev or
+ debrebase-last indicate that we are already in gdr format.