X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=0afe46a21f64110dfdfc194f109d8e78baffa294;hp=96e495e2641c09bf3c63a98459c9441400ae8e7b;hb=81e93ac2f3ac0b129f0d5e77d055b99053105892;hpb=d1d2476d690733d7a42ad4bde76b08ad73ac299e diff --git a/debian/changelog b/debian/changelog index 96e495e2..0afe46a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ 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. --