From b2bdd40bf5ae556a916474702768d26c380be7d1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Oct 2016 21:43:19 +0100
Subject: dgit: New config option slurping approach

Allows local git config options to override user-global ones, as is
proper.  Closes:#835858.

Also, we now need to handle -c options ourselves.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 5dc6258..e4f2630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,8 @@ dgit (1.5~~) unstable; urgency=medium
   * Don't break if user has push.followTags=true.  Closes:#827878.
   * Arrange for the special dgit remote to be skipped by git fetch --all
     etc.  Closes:#827892.
+  * Allow local git config options to override user-global ones,
+    as is proper.  Closes:#835858.
 
   Test suite:
   * When sbuild fails, do not crash due to sed not finding the log
-- 
cgit v1.2.3