From 8417abd83a6d2659bd556476ddee0a232d579eca Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 19 Jun 2018 17:02:27 +0100 Subject: git-debrebase: new-upstream: fix ff check handling of multi-piece upstreams Multi-piece combine commits may have n or n+1 parents, depending on whether the previous new-upstream invocation was snag-free. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index a70ec38..fc7aebb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (5.1~) unstable; urgency=medium * git-debrebase manpages: Fix typos and etc. + * git-debrebase: new-upstream: fix (this time for sure) ff check + handling of multi-piece upstreams. -- -- cgit v1.2.3