chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase convert-from-gbp: Add ffq check
[dgit.git]
/
debian
/
changelog
diff --git
a/debian/changelog
b/debian/changelog
index 82f6acc69c850a771fcada51fcab06ccd6508eb3..0afe46a21f64110dfdfc194f109d8e78baffa294 100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-2,6
+2,9
@@
dgit (5.9~) unstable; urgency=medium
* git-debrebase convert-from-gbp: Look for dgit-generated tags so we can
usually make the new branch ff of the dgit view. Closes:#903132.
* git-debrebase convert-from-gbp: Look for dgit-generated tags so we can
usually make the new branch ff of the dgit view. Closes:#903132.
+ * git-debrebase convert-from-gbp: Check that the result will not
+ count as having diverged. This will usually turn failures to make
+ the ff pseudomerge into -fdiverged. Related to #903132.
--
--