From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Jun 2018 22:02:06 +0000 (+0100)
Subject: Merge branch 'gdr-manpages' into wip.rebase
X-Git-Tag: archive/debian/5.0~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4eee70a2b1710c1a8fc71fbd3cdc7064682a799c;p=dgit.git

Merge branch 'gdr-manpages' into wip.rebase
---

4eee70a2b1710c1a8fc71fbd3cdc7064682a799c
diff --cc .gitignore
index e821bb4a,a804fa3c..ba7af789
--- a/.gitignore
+++ b/.gitignore
@@@ -12,7 -11,6 +12,8 @@@ dgit-nmu-simple.
  dgit-maint-native.7
  dgit-maint-merge.7
  dgit-maint-gbp.7
+ dgit-maint-debrebase.7
  dgit-sponsorship.7
 +git-debrebase.1
 +git-debrebase.5
  substituted