diff options
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 82f6acc..0afe46a 100644 --- 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: 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. -- |