[linux] 03/08: Do ignore /.gitignore and /.mailmap in the context of pkg-kernel via git svn

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy
in repository linux.

commit 35a92b93dc455218c1b2259cf1239fbad705cdd2
Author: Ian Campbell <ijc at debian.org>
Date:   Mon Jan 12 14:27:37 2015 +0000

    Do ignore /.gitignore and /.mailmap in the context of pkg-kernel via git svn
    
    (cherry picked from commit c3a49aefa1e0e9d63920de8e83eae892ed8c2724)
---
 debian/patches/debian/gitignore.patch | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
index 9387677..2ffc788 100644
--- a/debian/patches/debian/gitignore.patch
+++ b/debian/patches/debian/gitignore.patch
@@ -4,7 +4,7 @@ Subject: Tweak gitignore for Debian pkg-kernel using git svn.
 
 --- a/.gitignore
 +++ b/.gitignore
-@@ -46,11 +46,6 @@
+@@ -47,17 +47,6 @@
  /Module.symvers
  
  #
@@ -13,6 +13,12 @@ Subject: Tweak gitignore for Debian pkg-kernel using git svn.
 -/debian/
 -
 -#
- # git files that we don't want to ignore even it they are dot-files
+-# git files that we don't want to ignore even it they are dot-files
+-#
+-!.gitignore
+-!.mailmap
+-
+-#
+ # Generated include files
  #
- !.gitignore
+ include/config

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git