From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Jul 2017 20:40:29 +0000 (+0100)
Subject: Merge branch 'stable' into HEAD
X-Git-Tag: archive/debian/4.1~60
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4d5ef701bf95a1c60a5cc1b9f5c4d771ac49375a

Merge branch 'stable' into HEAD
---

4d5ef701bf95a1c60a5cc1b9f5c4d771ac49375a
diff --cc debian/changelog
index 1d57cfa9,5478618b..5978c663
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,4 +1,18 @@@
 +dgit (4.1~) experimental; urgency=medium
 +
 +  Internal changes:
 +  * using-these: New script to help with ad-hoc-testing.
 +
 + --
 +
 +dgit (4.0) experimental; urgency=low
 +
 +  * dgit: --deliberately-not-fast-forward works properly in
 +    split view quilt modes (suppressing the pseudomerge).
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 12 Feb 2017 22:22:31 +0000
 +
- dgit (3.12~) unstable; urgency=medium
+ dgit (3.12) unstable; urgency=high
  
    Important bugfixes to dgit:
    * Pass --no-renames to git diff-tree -z, avoiding potential trouble.