X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=0afe46a21f64110dfdfc194f109d8e78baffa294;hb=88169a03d4b1f865f2f5ca3adf2855c791435b17;hp=251d64f7c8909e11a38237d79e5a0b1fafab8f76;hpb=d51baf0412dd503a3c9ad66bf4a4bf845b6efb35;p=dgit.git diff --git a/debian/changelog b/debian/changelog index 251d64f7..0afe46a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,26 @@ -dgit (5.8~) unstable; urgency=medium +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. -- +dgit (5.8) unstable; urgency=medium + + Bugfixes: + * dgit, git-debrebase: Properly make patches even if an awkward + .gitignore ignores the things in debian/patches. Closes:#903130. + * git-debrebase status: Fix commit reporting. Closes:903131. + * git-debrebase new-upstream: Add a -1 revision if the user + didn't supply one. Closes:#903127. + * git-debrebase: Improve grammar if one blocking snag. + * dgit(1): Unscramble push[-source] descriptions. Closes:#903116. + + -- Ian Jackson Sun, 08 Jul 2018 11:42:41 +0100 + dgit (5.7) unstable; urgency=medium New feature: