chiark / gitweb /
Merge branch 'gdr-manpages' into wip.rebase
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Jun 2018 22:02:06 +0000 (23:02 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Jun 2018 22:02:06 +0000 (23:02 +0100)
1  2 
.gitignore
Makefile

diff --cc .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
diff --cc Makefile
Simple merge